diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
index ecf24feb853..a6b52582ef5 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
@@ -75,7 +75,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
 		myDaoConfig.setAllowExternalReferences(new DaoConfig().isAllowExternalReferences());
 		myDaoConfig.setReuseCachedSearchResultsForMillis(new DaoConfig().getReuseCachedSearchResultsForMillis());
-		
+		myDaoConfig.setCountSearchResultsUpTo(new DaoConfig().getCountSearchResultsUpTo());
+
 		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(null);
 		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(SearchCoordinatorSvcImpl.DEFAULT_SYNC_SIZE);
 		mySearchCoordinatorSvcRaw.setNeverUseLocalSearchForUnitTests(false);
@@ -116,20 +117,6 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		return retVal;
 	}
 
-	@Test
-	public void testUpdateWrongResourceType() throws IOException {
-		String input = IOUtils.toString(getClass().getResourceAsStream("/dstu3-person.json"), StandardCharsets.UTF_8);
-
-		try {
-			MethodOutcome resp = ourClient.update().resource(input).withId("Patient/PERSON1").execute();
-		} catch (InvalidRequestException e) {
-			assertEquals("", e.getMessage());
-		}
-
-		MethodOutcome resp = ourClient.update().resource(input).withId("Person/PERSON1").execute();
-		assertEquals("Person/PERSON1/_history/1", resp.getId().toUnqualified().getValue());
-	}
-
 	/**
 	 * See #484
 	 */
@@ -553,7 +540,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 			response.close();
 		}
 	}
-	
+
 	@Test
 	public void testCreateWithForcedId() throws IOException {
 		String methodName = "testCreateWithForcedId";
@@ -566,7 +553,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		assertEquals(methodName, optId.getIdPart());
 		assertEquals("1", optId.getVersionIdPart());
 	}
-
+	
 	@Test
 	public void testDeepChaining() {
 		Location l1 = new Location();
@@ -1571,6 +1558,27 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		}
 	}
 
+	@Test
+	public void testGetResourceCountsOperation() throws Exception {
+		String methodName = "testMetaOperations";
+
+		Patient pt = new Patient();
+		pt.addName().setFamily(methodName);
+		ourClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
+
+		HttpGet get = new HttpGet(ourServerBase + "/$get-resource-counts");
+		CloseableHttpResponse response = ourHttpClient.execute(get);
+		try {
+			assertEquals(200, response.getStatusLine().getStatusCode());
+			String output = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+			IOUtils.closeQuietly(response.getEntity().getContent());
+			ourLog.info(output);
+			assertThat(output, containsString("<parameter><name value=\"Patient\"/><valueInteger value=\""));
+		} finally {
+			response.close();
+		}
+	}
+
 	// private void delete(String theResourceType, String theParamName, String theParamValue) {
 	// Bundle resources;
 	// do {
@@ -1596,27 +1604,6 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 	// }
 	// }
 
-	@Test
-	public void testGetResourceCountsOperation() throws Exception {
-		String methodName = "testMetaOperations";
-
-		Patient pt = new Patient();
-		pt.addName().setFamily(methodName);
-		ourClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
-
-		HttpGet get = new HttpGet(ourServerBase + "/$get-resource-counts");
-		CloseableHttpResponse response = ourHttpClient.execute(get);
-		try {
-			assertEquals(200, response.getStatusLine().getStatusCode());
-			String output = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-			IOUtils.closeQuietly(response.getEntity().getContent());
-			ourLog.info(output);
-			assertThat(output, containsString("<parameter><name value=\"Patient\"/><valueInteger value=\""));
-		} finally {
-			response.close();
-		}
-	}
-
 	@Test
 	public void testHasParameter() throws Exception {
 		IIdType pid0;
@@ -1653,7 +1640,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
 		assertThat(ids, contains(pid0.getValue()));
 	}
-	
+
 	@Test
 	public void testHasParameterNoResults() throws Exception {
 
@@ -1668,7 +1655,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		}
 
 	}
-
+	
 	@Test
 	public void testHistoryWithAtParameter() throws Exception {
 		String methodName = "testHistoryWithFromAndTo";
@@ -3137,13 +3124,84 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		assertEquals(2, response.getEntry().size());
 	}
 
+	@Test
+	public void testSearchWithCountNotSet() throws Exception {
+		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
+		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
+
+		for (int i =0; i < 10; i++) {
+			Patient pat = new Patient();
+			pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
+			ourClient.create().resource(pat).execute();
+		}
+
+		Bundle found = ourClient
+			.search()
+			.forResource(Patient.class)
+			.returnBundle(Bundle.class)
+			.count(1)
+			.execute();
+
+		// If this fails under load, try increasing the throttle above
+		assertEquals(null, found.getTotalElement().getValue());
+		assertEquals(1, found.getEntry().size());
+	}
+
+	@Test
+	public void testSearchWithCountSearchResultsUpTo20() throws Exception {
+		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
+		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
+		myDaoConfig.setCountSearchResultsUpTo(20);
+
+		for (int i =0; i < 10; i++) {
+			Patient pat = new Patient();
+			pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
+			ourClient.create().resource(pat).execute();
+		}
+
+		Bundle found = ourClient
+			.search()
+			.forResource(Patient.class)
+			.returnBundle(Bundle.class)
+			.count(1)
+			.execute();
+
+		// If this fails under load, try increasing the throttle above
+		assertEquals(10, found.getTotalElement().getValue().intValue());
+		assertEquals(1, found.getEntry().size());
+	}
+
+	@Test
+	public void testSearchWithCountSearchResultsUpTo5() throws Exception {
+		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
+		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
+		myDaoConfig.setCountSearchResultsUpTo(5);
+
+		for (int i =0; i < 10; i++) {
+			Patient pat = new Patient();
+			pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
+			ourClient.create().resource(pat).execute();
+		}
+
+		Bundle found = ourClient
+			.search()
+			.forResource(Patient.class)
+			.returnBundle(Bundle.class)
+			.count(1)
+			.execute();
+
+		// If this fails under load, try increasing the throttle above
+		assertEquals(null, found.getTotalElement().getValue());
+		assertEquals(1, found.getEntry().size());
+	}
+
 	@Test
 	public void testSearchWithEmptyParameter() throws Exception {
 		Observation obs= new Observation();
 		obs.setStatus(ObservationStatus.FINAL);
 		obs.getCode().addCoding().setSystem("foo").setCode("bar");
 		ourClient.create().resource(obs).execute();
-		
+
 		testSearchWithEmptyParameter("/Observation?value-quantity=");
 		testSearchWithEmptyParameter("/Observation?code=bar&value-quantity=");
 		testSearchWithEmptyParameter("/Observation?value-date=");
@@ -3194,77 +3252,6 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		assertEquals(SearchEntryMode.INCLUDE, found.getEntry().get(1).getSearch().getMode());
 	}
 
-	@Test
-	public void testSearchWithCountNotSet() throws Exception {
-		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
-		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
-
-		for (int i =0; i < 10; i++) {
-			Patient pat = new Patient();
-			pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
-			ourClient.create().resource(pat).execute();
-		}
-
-		Bundle found = ourClient
-			.search()
-			.forResource(Patient.class)
-			.returnBundle(Bundle.class)
-			.count(1)
-			.execute();
-
-		// If this fails under load, try increasing the throttle above
-		assertEquals(null, found.getTotalElement().getValue());
-		assertEquals(1, found.getEntry().size());
-	}
-
-	@Test
-	public void testSearchWithCountSearchResultsUpTo5() throws Exception {
-		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
-		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
-		myDaoConfig.setCountSearchResultsUpTo(5);
-
-		for (int i =0; i < 10; i++) {
-			Patient pat = new Patient();
-			pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
-			ourClient.create().resource(pat).execute();
-		}
-
-		Bundle found = ourClient
-			.search()
-			.forResource(Patient.class)
-			.returnBundle(Bundle.class)
-			.count(1)
-			.execute();
-
-		// If this fails under load, try increasing the throttle above
-		assertEquals(null, found.getTotalElement().getValue());
-		assertEquals(1, found.getEntry().size());
-	}
-
-	@Test
-	public void testSearchWithCountSearchResultsUpTo20() throws Exception {
-		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
-		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
-		myDaoConfig.setCountSearchResultsUpTo(20);
-
-		for (int i =0; i < 10; i++) {
-			Patient pat = new Patient();
-			pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
-			ourClient.create().resource(pat).execute();
-		}
-
-		Bundle found = ourClient
-			.search()
-			.forResource(Patient.class)
-			.returnBundle(Bundle.class)
-			.count(1)
-			.execute();
-
-		// If this fails under load, try increasing the throttle above
-		assertEquals(10, found.getTotalElement().getValue().intValue());
-		assertEquals(1, found.getEntry().size());
-	}
-
 	@Test()
 	public void testSearchWithInvalidNumberPrefix() throws Exception {
 		try {
@@ -4069,6 +4056,20 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		}
 	}
 
+	@Test
+	public void testUpdateWrongResourceType() throws IOException {
+		String input = IOUtils.toString(getClass().getResourceAsStream("/dstu3-person.json"), StandardCharsets.UTF_8);
+
+		try {
+			MethodOutcome resp = ourClient.update().resource(input).withId("Patient/PERSON1").execute();
+		} catch (InvalidRequestException e) {
+			assertEquals("", e.getMessage());
+		}
+
+		MethodOutcome resp = ourClient.update().resource(input).withId("Person/PERSON1").execute();
+		assertEquals("Person/PERSON1/_history/1", resp.getId().toUnqualified().getValue());
+	}
+
 	@Test
 	public void testValidateBadInputViaGet() throws IOException {
 
diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlightingInterceptorTest.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlightingInterceptorTest.java
index d5d198902c6..3b2818641d3 100644
--- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlightingInterceptorTest.java
+++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlightingInterceptorTest.java
@@ -61,92 +61,230 @@ import ca.uhn.fhir.util.*;
 
 public class ResponseHighlightingInterceptorTest {
 
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResponseHighlightingInterceptorTest.class);
 	private static ResponseHighlighterInterceptor ourInterceptor = new ResponseHighlighterInterceptor();
 	private static CloseableHttpClient ourClient;
 	private static FhirContext ourCtx = FhirContext.forDstu2();
-	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResponseHighlightingInterceptorTest.class);
 	private static int ourPort;
 
 	private static Server ourServer;
 	private static RestfulServer ourServlet;
 
-	@AfterClass
-	public static void afterClassClearContext() {
-		TestUtil.clearAllStaticFieldsForUnitTest();
-	}
-
 	@Before
 	public void before() {
 		ourInterceptor.setShowRequestHeaders(new ResponseHighlighterInterceptor().isShowRequestHeaders());
 		ourInterceptor.setShowResponseHeaders(new ResponseHighlighterInterceptor().isShowResponseHeaders());
 	}
 
-	/**
-	 * For interactive testing only
-	 */
 	@Test
-	public void waitForInput() throws IOException {
-		System.in.read();
+	public void testBinaryReadAcceptBrowser() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Binary/foo");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+		httpGet.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		byte[] responseContent = IOUtils.toByteArray(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals("foo", status.getFirstHeader("content-type").getValue());
+		assertEquals("Attachment;", status.getFirstHeader("Content-Disposition").getValue());
+		assertArrayEquals(new byte[] { 1, 2, 3, 4 }, responseContent);
 	}
 
-	/**
-	 * See #464
-	 */
 	@Test
-	public void testPrettyPrintDefaultsToTrue() throws Exception {
-		ourServlet.setDefaultPrettyPrint(false);
-		
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1");
-		httpGet.addHeader("Accept", "text/html");
+	public void testBinaryReadAcceptFhirJson() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Binary/foo");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+		httpGet.addHeader("Accept", Constants.CT_FHIR_JSON);
 
 		HttpResponse status = ourClient.execute(httpGet);
 		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
-		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
+		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertNull(status.getFirstHeader("Content-Disposition"));
+		assertEquals("{\"resourceType\":\"Binary\",\"id\":\"1\",\"contentType\":\"foo\",\"content\":\"AQIDBA==\"}", responseContent);
+
 	}
 
-	/**
-	 * See #464
-	 */
 	@Test
-	public void testPrettyPrintDefaultsToTrueWithExplicitTrue() throws Exception {
-		ourServlet.setDefaultPrettyPrint(false);
-		
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_pretty=true");
-		httpGet.addHeader("Accept", "text/html");
+	public void testBinaryReadAcceptMissing() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Binary/foo");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		byte[] responseContent = IOUtils.toByteArray(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals("foo", status.getFirstHeader("content-type").getValue());
+		assertEquals("Attachment;", status.getFirstHeader("Content-Disposition").getValue());
+		assertArrayEquals(new byte[] { 1, 2, 3, 4 }, responseContent);
+
+	}
+
+	@Test
+	public void testDontHighlightWhenOriginHeaderPresent() throws Exception {
+		ResponseHighlighterInterceptor ic = ourInterceptor;
+
+		HttpServletRequest req = mock(HttpServletRequest.class);
+		when(req.getHeaders(Constants.HEADER_ACCEPT)).thenAnswer(new Answer<Enumeration<String>>() {
+			@Override
+			public Enumeration<String> answer(InvocationOnMock theInvocation) throws Throwable {
+				return new ArrayEnumeration<String>("text/html,application/xhtml+xml,application/xml;q=0.9");
+			}
+		});
+		when(req.getHeader(Constants.HEADER_ORIGIN)).thenAnswer(new Answer<String>() {
+			@Override
+			public String answer(InvocationOnMock theInvocation) throws Throwable {
+				return "http://example.com";
+			}
+		});
+
+		HttpServletResponse resp = mock(HttpServletResponse.class);
+		StringWriter sw = new StringWriter();
+		when(resp.getWriter()).thenReturn(new PrintWriter(sw));
+
+		Patient resource = new Patient();
+		resource.addName().addFamily("FAMILY");
+
+		ServletRequestDetails reqDetails = new TestServletRequestDetails();
+		reqDetails.setRequestType(RequestTypeEnum.GET);
+		HashMap<String, String[]> params = new HashMap<String, String[]>();
+		reqDetails.setParameters(params);
+		reqDetails.setServer(new RestfulServer(ourCtx));
+		reqDetails.setServletRequest(req);
+
+		// true means it decided to not handle the request..
+		assertTrue(ic.outgoingResponse(reqDetails, resource, req, resp));
+
+	}
+
+	@Test
+	public void testForceApplicationJson() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/json");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
 
 		HttpResponse status = ourClient.execute(httpGet);
 		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
-		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
+		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsString("html")));
 	}
 
-	/**
-	 * See #464
-	 */
 	@Test
-	public void testPrettyPrintDefaultsToTrueWithExplicitFalse() throws Exception {
-		ourServlet.setDefaultPrettyPrint(false);
-		
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_pretty=false");
-		httpGet.addHeader("Accept", "text/html");
+	public void testForceApplicationJsonFhir() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/json+fhir");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
 
 		HttpResponse status = ourClient.execute(httpGet);
 		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
-		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertThat(responseContent, not(stringContainsInOrder("<body>", "<pre>", "\n", "</pre>")));
+		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsString("html")));
+	}
+
+	@Test
+	public void testForceApplicationJsonPlusFhir() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=" + UrlUtil.escape("application/json+fhir"));
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsString("html")));
+	}
+
+	@Test
+	public void testForceApplicationXml() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/xml");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals(Constants.CT_FHIR_XML + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsString("html")));
+	}
+
+	@Test
+	public void testForceApplicationXmlFhir() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/xml+fhir");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals(Constants.CT_FHIR_XML + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsString("html")));
+	}
+
+	@Test
+	public void testForceApplicationXmlPlusFhir() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=" + UrlUtil.escape("application/xml+fhir"));
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals(Constants.CT_FHIR_XML + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsString("html")));
+	}
+
+	@Test
+	public void testForceHtmlJson() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, containsString("html"));
+		assertThat(responseContent, containsString(">{<"));
+		assertThat(responseContent, not(containsString("&lt;")));
+
+		ourLog.info(responseContent);
+	}
+
+	@Test
+	public void testForceHtmlXml() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/xml");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, containsString("html"));
+		assertThat(responseContent, not(containsString(">{<")));
+		assertThat(responseContent, containsString("&lt;"));
+	}
+
+	@Test
+	public void testForceJson() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=json");
+		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsString("html")));
 	}
 
 	@Test
 	public void testForceResponseTime() throws Exception {
 		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
-		
+
 		HttpResponse status = ourClient.execute(httpGet);
 		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
@@ -154,74 +292,7 @@ public class ResponseHighlightingInterceptorTest {
 		assertEquals(200, status.getStatusLine().getStatusCode());
 		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
 		assertThat(responseContent.replace('\n', ' ').replace('\r', ' '), matchesPattern(".*Response generated in [0-9]+ms.*"));
-		
-	}
 
-	@Test
-	public void testShowNeither() throws Exception {
-		ourInterceptor.setShowRequestHeaders(false);
-		ourInterceptor.setShowResponseHeaders(false);
-		
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		ourLog.info(responseContent);
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsStringIgnoringCase("Accept")));
-		assertThat(responseContent, not(containsStringIgnoringCase("Content-Type")));
-	}
-
-	@Test
-	public void testShowResponse() throws Exception {
-		ourInterceptor.setShowResponseHeaders(true);
-		
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		ourLog.info(responseContent);
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsStringIgnoringCase("Accept")));
-		assertThat(responseContent, (containsStringIgnoringCase("Content-Type")));
-	}
-
-	@Test
-	public void testShowRequest() throws Exception {
-		ourInterceptor.setShowRequestHeaders(true);
-		ourInterceptor.setShowResponseHeaders(false);
-		
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		ourLog.info(responseContent);
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, (containsStringIgnoringCase("Accept")));
-		assertThat(responseContent, not(containsStringIgnoringCase("Content-Type")));
-	}
-
-	@Test
-	public void testShowRequestAndResponse() throws Exception {
-		ourInterceptor.setShowRequestHeaders(true);
-		ourInterceptor.setShowResponseHeaders(true);
-		
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		ourLog.info(responseContent);
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, (containsStringIgnoringCase("Accept")));
-		assertThat(responseContent, (containsStringIgnoringCase("Content-Type")));
 	}
 
 	@Test
@@ -238,7 +309,7 @@ public class ResponseHighlightingInterceptorTest {
 		assertThat(responseContent, stringContainsInOrder("<span class='hlTagName'>OperationOutcome</span>", "Unknown resource type 'Foobar' - Server knows how to handle"));
 
 	}
-
+	
 	@Test
 	public void testGetInvalidResourceNoAcceptHeader() throws Exception {
 		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Foobar/123");
@@ -296,7 +367,7 @@ public class ResponseHighlightingInterceptorTest {
 
 		// This can be null depending on the exception type
 		// reqDetails.setParameters(null);
-		
+
 		ResourceNotFoundException exception = new ResourceNotFoundException("Not found");
 		exception.setOperationOutcome(new OperationOutcome().addIssue(new Issue().setDiagnostics("Hello")));
 
@@ -307,113 +378,6 @@ public class ResponseHighlightingInterceptorTest {
 		assertThat(output, containsString("<span class='hlTagName'>OperationOutcome</span>"));
 	}
 
-
-	@Test
-	public void testHighlightNormalResponseForcePrettyPrint() throws Exception {
-		ResponseHighlighterInterceptor ic = ourInterceptor;
-
-		HttpServletRequest req = mock(HttpServletRequest.class);
-		when(req.getHeaders(Constants.HEADER_ACCEPT)).thenAnswer(new Answer<Enumeration<String>>() {
-			@Override
-			public Enumeration<String> answer(InvocationOnMock theInvocation) throws Throwable {
-				return new ArrayEnumeration<String>("text/html,application/xhtml+xml,application/xml;q=0.9");
-			}
-		});
-
-		HttpServletResponse resp = mock(HttpServletResponse.class);
-		StringWriter sw = new StringWriter();
-		when(resp.getWriter()).thenReturn(new PrintWriter(sw));
-
-		Patient resource = new Patient();
-		resource.addName().addFamily("FAMILY");
-
-		ServletRequestDetails reqDetails = new TestServletRequestDetails();
-		reqDetails.setRequestType(RequestTypeEnum.GET);
-		HashMap<String, String[]> params = new HashMap<String, String[]>();
-		params.put(Constants.PARAM_PRETTY, new String[] { Constants.PARAM_PRETTY_VALUE_TRUE });
-		reqDetails.setParameters(params);
-		reqDetails.setServer(new RestfulServer(ourCtx));
-		reqDetails.setServletRequest(req);
-
-		assertFalse(ic.outgoingResponse(reqDetails, resource, req, resp));
-
-		String output = sw.getBuffer().toString();
-		ourLog.info(output);
-		assertThat(output, containsString("<span class='hlTagName'>Patient</span>"));
-		assertThat(output, stringContainsInOrder("<body>", "<pre>", "<div", "</pre>"));
-	}
-
-	@Test
-	public void testHighlightForceRaw() throws Exception {
-		ResponseHighlighterInterceptor ic = ourInterceptor;
-
-		HttpServletRequest req = mock(HttpServletRequest.class);
-		when(req.getHeaders(Constants.HEADER_ACCEPT)).thenAnswer(new Answer<Enumeration<String>>() {
-			@Override
-			public Enumeration<String> answer(InvocationOnMock theInvocation) throws Throwable {
-				return new ArrayEnumeration<String>("text/html,application/xhtml+xml,application/xml;q=0.9");
-			}
-		});
-
-		HttpServletResponse resp = mock(HttpServletResponse.class);
-		StringWriter sw = new StringWriter();
-		when(resp.getWriter()).thenReturn(new PrintWriter(sw));
-
-		Patient resource = new Patient();
-		resource.addName().addFamily("FAMILY");
-
-		ServletRequestDetails reqDetails = new TestServletRequestDetails();
-		reqDetails.setRequestType(RequestTypeEnum.GET);
-		HashMap<String, String[]> params = new HashMap<String, String[]>();
-		params.put(Constants.PARAM_PRETTY, new String[] { Constants.PARAM_PRETTY_VALUE_TRUE });
-		params.put(Constants.PARAM_FORMAT, new String[] { Constants.CT_XML });
-		params.put(ResponseHighlighterInterceptor.PARAM_RAW, new String[] { ResponseHighlighterInterceptor.PARAM_RAW_TRUE });
-		reqDetails.setParameters(params);
-		reqDetails.setServer(new RestfulServer(ourCtx));
-		reqDetails.setServletRequest(req);
-
-		// true means it decided to not handle the request..
-		assertTrue(ic.outgoingResponse(reqDetails, resource, req, resp));
-
-	}
-	
-	@Test
-	public void testDontHighlightWhenOriginHeaderPresent() throws Exception {
-		ResponseHighlighterInterceptor ic = ourInterceptor;
-
-		HttpServletRequest req = mock(HttpServletRequest.class);
-		when(req.getHeaders(Constants.HEADER_ACCEPT)).thenAnswer(new Answer<Enumeration<String>>() {
-			@Override
-			public Enumeration<String> answer(InvocationOnMock theInvocation) throws Throwable {
-				return new ArrayEnumeration<String>("text/html,application/xhtml+xml,application/xml;q=0.9");
-			}
-		});
-		when(req.getHeader(Constants.HEADER_ORIGIN)).thenAnswer(new Answer<String>() {
-			@Override
-			public String answer(InvocationOnMock theInvocation) throws Throwable {
-				return "http://example.com";
-			}
-		});
-
-		HttpServletResponse resp = mock(HttpServletResponse.class);
-		StringWriter sw = new StringWriter();
-		when(resp.getWriter()).thenReturn(new PrintWriter(sw));
-
-		Patient resource = new Patient();
-		resource.addName().addFamily("FAMILY");
-
-		ServletRequestDetails reqDetails = new TestServletRequestDetails();
-		reqDetails.setRequestType(RequestTypeEnum.GET);
-		HashMap<String, String[]> params = new HashMap<String, String[]>();
-		reqDetails.setParameters(params);
-		reqDetails.setServer(new RestfulServer(ourCtx));
-		reqDetails.setServletRequest(req);
-
-		// true means it decided to not handle the request..
-		assertTrue(ic.outgoingResponse(reqDetails, resource, req, resp));
-
-	}
-
 	/**
 	 * See #346
 	 */
@@ -482,6 +446,40 @@ public class ResponseHighlightingInterceptorTest {
 		assertFalse(ic.outgoingResponse(reqDetails, resource, req, resp));
 	}
 
+	@Test
+	public void testHighlightForceRaw() throws Exception {
+		ResponseHighlighterInterceptor ic = ourInterceptor;
+
+		HttpServletRequest req = mock(HttpServletRequest.class);
+		when(req.getHeaders(Constants.HEADER_ACCEPT)).thenAnswer(new Answer<Enumeration<String>>() {
+			@Override
+			public Enumeration<String> answer(InvocationOnMock theInvocation) throws Throwable {
+				return new ArrayEnumeration<String>("text/html,application/xhtml+xml,application/xml;q=0.9");
+			}
+		});
+
+		HttpServletResponse resp = mock(HttpServletResponse.class);
+		StringWriter sw = new StringWriter();
+		when(resp.getWriter()).thenReturn(new PrintWriter(sw));
+
+		Patient resource = new Patient();
+		resource.addName().addFamily("FAMILY");
+
+		ServletRequestDetails reqDetails = new TestServletRequestDetails();
+		reqDetails.setRequestType(RequestTypeEnum.GET);
+		HashMap<String, String[]> params = new HashMap<String, String[]>();
+		params.put(Constants.PARAM_PRETTY, new String[] { Constants.PARAM_PRETTY_VALUE_TRUE });
+		params.put(Constants.PARAM_FORMAT, new String[] { Constants.CT_XML });
+		params.put(ResponseHighlighterInterceptor.PARAM_RAW, new String[] { ResponseHighlighterInterceptor.PARAM_RAW_TRUE });
+		reqDetails.setParameters(params);
+		reqDetails.setServer(new RestfulServer(ourCtx));
+		reqDetails.setServletRequest(req);
+
+		// true means it decided to not handle the request..
+		assertTrue(ic.outgoingResponse(reqDetails, resource, req, resp));
+
+	}
+
 	@Test
 	public void testHighlightNormalResponse() throws Exception {
 		ResponseHighlighterInterceptor ic = ourInterceptor;
@@ -516,6 +514,41 @@ public class ResponseHighlightingInterceptorTest {
 		assertThat(output, containsString("<a href=\"?_format=json\">"));
 	}
 
+	@Test
+	public void testHighlightNormalResponseForcePrettyPrint() throws Exception {
+		ResponseHighlighterInterceptor ic = ourInterceptor;
+
+		HttpServletRequest req = mock(HttpServletRequest.class);
+		when(req.getHeaders(Constants.HEADER_ACCEPT)).thenAnswer(new Answer<Enumeration<String>>() {
+			@Override
+			public Enumeration<String> answer(InvocationOnMock theInvocation) throws Throwable {
+				return new ArrayEnumeration<String>("text/html,application/xhtml+xml,application/xml;q=0.9");
+			}
+		});
+
+		HttpServletResponse resp = mock(HttpServletResponse.class);
+		StringWriter sw = new StringWriter();
+		when(resp.getWriter()).thenReturn(new PrintWriter(sw));
+
+		Patient resource = new Patient();
+		resource.addName().addFamily("FAMILY");
+
+		ServletRequestDetails reqDetails = new TestServletRequestDetails();
+		reqDetails.setRequestType(RequestTypeEnum.GET);
+		HashMap<String, String[]> params = new HashMap<String, String[]>();
+		params.put(Constants.PARAM_PRETTY, new String[] { Constants.PARAM_PRETTY_VALUE_TRUE });
+		reqDetails.setParameters(params);
+		reqDetails.setServer(new RestfulServer(ourCtx));
+		reqDetails.setServletRequest(req);
+
+		assertFalse(ic.outgoingResponse(reqDetails, resource, req, resp));
+
+		String output = sw.getBuffer().toString();
+		ourLog.info(output);
+		assertThat(output, containsString("<span class='hlTagName'>Patient</span>"));
+		assertThat(output, stringContainsInOrder("<body>", "<pre>", "<div", "</pre>"));
+	}
+
 	/**
 	 * Browsers declare XML but not JSON in their accept header, we should still respond using JSON if that's the default
 	 */
@@ -553,9 +586,6 @@ public class ResponseHighlightingInterceptorTest {
 		ourLog.info(output);
 		assertThat(output, containsString("resourceType"));
 	}
-
-	
-	
 	
 	@Test
 	public void testHighlightProducesDefaultJsonWithBrowserRequest2() throws Exception {
@@ -589,6 +619,60 @@ public class ResponseHighlightingInterceptorTest {
 		assertTrue(ic.outgoingResponse(reqDetails, resource, req, resp));
 	}
 
+	/**
+	 * See #464
+	 */
+	@Test
+	public void testPrettyPrintDefaultsToTrue() throws Exception {
+		ourServlet.setDefaultPrettyPrint(false);
+
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1");
+		httpGet.addHeader("Accept", "text/html");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info(responseContent);
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
+	}
+
+	/**
+	 * See #464
+	 */
+	@Test
+	public void testPrettyPrintDefaultsToTrueWithExplicitFalse() throws Exception {
+		ourServlet.setDefaultPrettyPrint(false);
+
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_pretty=false");
+		httpGet.addHeader("Accept", "text/html");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info(responseContent);
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, not(stringContainsInOrder("<body>", "<pre>", "\n", "</pre>")));
+	}
+
+	/**
+	 * See #464
+	 */
+	@Test
+	public void testPrettyPrintDefaultsToTrueWithExplicitTrue() throws Exception {
+		ourServlet.setDefaultPrettyPrint(false);
+
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_pretty=true");
+		httpGet.addHeader("Accept", "text/html");
+
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info(responseContent);
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
+	}
+
 	@Test
 	public void testSearchWithSummaryParam() throws Exception {
 		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?_query=searchWithWildcardRetVal&_summary=count");
@@ -603,169 +687,75 @@ public class ResponseHighlightingInterceptorTest {
 	}
 
 	@Test
-	public void testBinaryReadAcceptMissing() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Binary/foo");
+	public void testShowNeither() throws Exception {
+		ourInterceptor.setShowRequestHeaders(false);
+		ourInterceptor.setShowResponseHeaders(false);
 
-		HttpResponse status = ourClient.execute(httpGet);
-		byte[] responseContent = IOUtils.toByteArray(status.getEntity().getContent());
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals("foo", status.getFirstHeader("content-type").getValue());
-		assertEquals("Attachment;", status.getFirstHeader("Content-Disposition").getValue());
-		assertArrayEquals(new byte[] { 1, 2, 3, 4 }, responseContent);
-
-	}
-
-	@Test
-	public void testBinaryReadAcceptBrowser() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Binary/foo");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		httpGet.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		byte[] responseContent = IOUtils.toByteArray(status.getEntity().getContent());
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals("foo", status.getFirstHeader("content-type").getValue());
-		assertEquals("Attachment;", status.getFirstHeader("Content-Disposition").getValue());
-		assertArrayEquals(new byte[] { 1, 2, 3, 4 }, responseContent);
-	}
-	
-	@Test
-	public void testBinaryReadAcceptFhirJson() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Binary/foo");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		httpGet.addHeader("Accept", Constants.CT_FHIR_JSON);
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertNull(status.getFirstHeader("Content-Disposition"));
-		assertEquals("{\"resourceType\":\"Binary\",\"id\":\"1\",\"contentType\":\"foo\",\"content\":\"AQIDBA==\"}", responseContent);
-
-	}
-	@Test
-	public void testForceApplicationJson() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/json");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsString("html")));
-	}
-	@Test
-	public void testForceApplicationJsonFhir() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/json+fhir");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsString("html")));
-	}
-
-	@Test
-	public void testForceApplicationJsonPlusFhir() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=" + UrlUtil.escape("application/json+fhir"));
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsString("html")));
-	}
-
-	@Test
-	public void testForceJson() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=json");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
-		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_JSON + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsString("html")));
-	}
-
-
-	
-	@Test
-	public void testForceHtmlJson() throws Exception {
 		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
+
 		HttpResponse status = ourClient.execute(httpGet);
 		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
-		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, containsString("html"));
-		assertThat(responseContent, containsString(">{<"));
-		assertThat(responseContent, not(containsString("&lt;")));
-		
 		ourLog.info(responseContent);
-	}
-	
-	@Test
-	public void testForceHtmlXml() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/xml");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
-		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent());
-		IOUtils.closeQuietly(status.getEntity().getContent());
 		assertEquals(200, status.getStatusLine().getStatusCode());
 		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, containsString("html"));
-		assertThat(responseContent, not(containsString(">{<")));
-		assertThat(responseContent, containsString("&lt;"));
+		assertThat(responseContent, not(containsStringIgnoringCase("Accept")));
+		assertThat(responseContent, not(containsStringIgnoringCase("Content-Type")));
 	}
 	
 	@Test
-	public void testForceApplicationXml() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/xml");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
+	public void testShowRequest() throws Exception {
+		ourInterceptor.setShowRequestHeaders(true);
+		ourInterceptor.setShowResponseHeaders(false);
+
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
+
 		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_XML + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsString("html")));
+		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, (containsStringIgnoringCase("Accept")));
+		assertThat(responseContent, not(containsStringIgnoringCase("Content-Type")));
 	}
+	
 	@Test
-	public void testForceApplicationXmlFhir() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=application/xml+fhir");
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
+	public void testShowRequestAndResponse() throws Exception {
+		ourInterceptor.setShowRequestHeaders(true);
+		ourInterceptor.setShowResponseHeaders(true);
+
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
+
 		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_XML + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsString("html")));
+		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, (containsStringIgnoringCase("Accept")));
+		assertThat(responseContent, (containsStringIgnoringCase("Content-Type")));
 	}
+
 	@Test
-	public void testForceApplicationXmlPlusFhir() throws Exception {
-		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=" + UrlUtil.escape("application/xml+fhir"));
-		httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1");
-		
+	public void testShowResponse() throws Exception {
+		ourInterceptor.setShowResponseHeaders(true);
+
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1?_format=html/json");
+
 		HttpResponse status = ourClient.execute(httpGet);
-		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		String responseContent = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
 		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info(responseContent);
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertEquals(Constants.CT_FHIR_XML + ";charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
-		assertThat(responseContent, not(containsString("html")));
+		assertEquals("text/html;charset=utf-8", status.getFirstHeader("content-type").getValue().replace(" ", "").toLowerCase());
+		assertThat(responseContent, not(containsStringIgnoringCase("Accept")));
+		assertThat(responseContent, (containsStringIgnoringCase("Content-Type")));
+	}
+
+	@AfterClass
+	public static void afterClassClearContext() {
+		TestUtil.clearAllStaticFieldsForUnitTest();
 	}
 
 	@BeforeClass
@@ -812,6 +802,13 @@ public class ResponseHighlightingInterceptorTest {
 
 	}
 	
+	class TestServletRequestDetails extends ServletRequestDetails {
+		@Override
+		public String getServerBaseForRequest() {
+			return "/baseDstu3";
+		}
+	}
+
 	public static class DummyBinaryResourceProvider implements IResourceProvider {
 
 		@Override
@@ -839,7 +836,6 @@ public class ResponseHighlightingInterceptorTest {
 
 	}
 
-
 	public static class DummyPatientResourceProvider implements IResourceProvider {
 
 		private Patient createPatient1() {
@@ -898,7 +894,7 @@ public class ResponseHighlightingInterceptorTest {
 
 		/**
 		 * Retrieve the resource by its identifier
-		 * 
+		 *
 		 * @param theId
 		 *           The resource identity
 		 * @return The resource
@@ -912,7 +908,7 @@ public class ResponseHighlightingInterceptorTest {
 
 		/**
 		 * Retrieve the resource by its identifier
-		 * 
+		 *
 		 * @param theId
 		 *           The resource identity
 		 * @return The resource
@@ -942,11 +938,4 @@ public class ResponseHighlightingInterceptorTest {
 
 	}
 
-	class TestServletRequestDetails extends ServletRequestDetails {
-		@Override
-		public String getServerBaseForRequest() {
-			return "/baseDstu3";
-		}
-	}
-
 }
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/AllTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/AllTests.java
deleted file mode 100644
index c09bf8c6c7c..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/AllTests.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({ FluentPathTests.class, NarrativeGeneratorTests.class, /*ShexGeneratorTests.class, StructureMapTests.class, */ TurtleTests.class, GraphQLParserTests.class })
-public class AllTests {
-
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/FluentPathTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/FluentPathTests.java
deleted file mode 100644
index 48138d27ff4..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/FluentPathTests.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.hl7.fhir.r4.context.SimpleWorkerContext;
-import org.hl7.fhir.r4.formats.XmlParser;
-import org.hl7.fhir.r4.model.Base;
-import org.hl7.fhir.r4.model.BooleanType;
-import org.hl7.fhir.r4.model.ExpressionNode;
-import org.hl7.fhir.r4.model.PrimitiveType;
-import org.hl7.fhir.r4.model.Resource;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.r4.utils.FHIRPathEngine;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.utilities.xml.XMLUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-import junit.framework.Assert;
-
-@RunWith(Parameterized.class)
-public class FluentPathTests {
-
-  private static FHIRPathEngine fp;
-
-  @Parameters(name = "{index}: file {0}")
-  public static Iterable<Object[]> data() throws ParserConfigurationException, SAXException, IOException {
-    Document dom = XMLUtil.parseFileToDom(Utilities.path(TestingUtilities. home(), "tests", "resources", "tests-fhir-r4.xml"));
-
-    List<Element> list = new ArrayList<Element>();
-    List<Element> groups = new ArrayList<Element>();
-    XMLUtil.getNamedChildren(dom.getDocumentElement(), "group", groups);
-    for (Element g : groups) {
-      XMLUtil.getNamedChildren(g, "test", list);      
-    }
-
-    List<Object[]> objects = new ArrayList<Object[]>(list.size());
-
-    for (Element e : list) {
-      objects.add(new Object[] { getName(e), e });
-    }
-
-    return objects;
-  }
-
-  private static Object getName(Element e) {
-    String s = e.getAttribute("name");
-    if (Utilities.noString(s)) {
-      Element p = (Element) e.getParentNode();
-      int ndx = 0;
-      for (int i = 0; i < p.getChildNodes().getLength(); i++) {
-        Node c = p.getChildNodes().item(i);
-        if (c == e)
-          break;
-        else if (c instanceof Element)
-          ndx++;
-      }
-      s = p.getAttribute("name")+" - "+Integer.toString(ndx+1);
-    }
-    return s;
-  }
-
-  private final Element test;
-  private final String name;
-
-  public FluentPathTests(String name, Element e) {
-    this.name = name;
-    this.test = e;
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test() throws FileNotFoundException, IOException, FHIRException, org.hl7.fhir.exceptions.FHIRException {
-    if (TestingUtilities.context == null)
-      TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-    if (fp == null)
-      fp = new FHIRPathEngine(TestingUtilities.context);
-    String input = test.getAttribute("inputfile");
-    String expression = XMLUtil.getNamedChild(test, "expression").getTextContent();
-    boolean fail = "true".equals(XMLUtil.getNamedChild(test, "expression").getAttribute("invalid"));
-    Resource res = null;
-
-    List<Base> outcome = new ArrayList<Base>();
-
-    ExpressionNode node = fp.parse(expression);
-    try {
-      if (Utilities.noString(input))
-        fp.check(null, null, node);
-      else {
-        res = new XmlParser().parse(new FileInputStream(Utilities.path(TestingUtilities.home(), "publish", input)));
-        fp.check(res, res.getResourceType().toString(), res.getResourceType().toString(), node);
-      }
-      outcome = fp.evaluate(res, node);
-      Assert.assertTrue(String.format("Expected exception parsing %s", expression), !fail);
-    } catch (Exception e) {
-      Assert.assertTrue(String.format("Unexpected exception parsing %s: "+e.getMessage(), expression), fail);
-    }
-
-    if ("true".equals(test.getAttribute("predicate"))) {
-      boolean ok = fp.convertToBoolean(outcome);
-      outcome.clear();
-      outcome.add(new BooleanType(ok));
-    }
-    if (fp.hasLog())
-      System.out.println(fp.takeLog());
-
-    List<Element> expected = new ArrayList<Element>();
-    XMLUtil.getNamedChildren(test, "output", expected);
-    Assert.assertTrue(String.format("Expected %d objects but found %d", expected.size(), outcome.size()), outcome.size() == expected.size());
-    for (int i = 0; i < Math.min(outcome.size(), expected.size()); i++) {
-      String tn = expected.get(i).getAttribute("type");
-      if (!Utilities.noString(tn)) {
-        Assert.assertTrue(String.format("Outcome %d: Type should be %s but was %s", i, tn, outcome.get(i).fhirType()), tn.equals(outcome.get(i).fhirType()));
-      }
-      String v = expected.get(i).getTextContent();
-      if (!Utilities.noString(v)) {
-        Assert.assertTrue(String.format("Outcome %d: Value should be a primitive type but was %s", i, outcome.get(i).fhirType()), outcome.get(i) instanceof PrimitiveType);
-        Assert.assertTrue(String.format("Outcome %d: Value should be %s but was %s", i, v, outcome.get(i).toString()), v.equals(((PrimitiveType)outcome.get(i)).asStringValue()));
-      }
-    }
-  }
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/GraphQLParserTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/GraphQLParserTests.java
deleted file mode 100644
index 2bb0aba384a..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/GraphQLParserTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import static org.junit.Assert.*;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.utilities.TextFile;
-import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.utilities.graphql.EGraphEngine;
-import org.hl7.fhir.utilities.graphql.EGraphQLException;
-import org.hl7.fhir.utilities.graphql.Package;
-import org.hl7.fhir.utilities.graphql.Parser;
-import org.hl7.fhir.utilities.xml.XMLUtil;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-@RunWith(Parameterized.class)
-public class GraphQLParserTests {
-
-  @Parameters(name = "{index}: {0}")
-  public static Iterable<Object[]> data() throws FileNotFoundException, IOException  {
-    String src = TextFile.fileToString(Utilities.path(TestingUtilities.home(), "tests", "graphql", "parser-tests.gql"));
-    String[] tests = src.split("###");
-    int i = 0;
-    for (String s : tests) 
-      if (!Utilities.noString(s.trim()))
-        i++;
-    List<Object[]> objects = new ArrayList<Object[]>(i);
-    i = 0;
-    for (String s : tests) {
-      if (!Utilities.noString(s.trim())) {
-        int l = s.indexOf('\r');        
-        objects.add(new Object[] { s.substring(0,  l), s.substring(l+2).trim()});
-      }
-    }
-    return objects;
-  }
-
-  private final String test;
-  private final String name;
-
-  public GraphQLParserTests(String name, String test) {
-    this.name = name;
-    this.test = test;
-  }
-
-  @Test
-  public void test() throws IOException, EGraphQLException, EGraphEngine {
-    Package doc = Parser.parse(test);
-    Assert.assertTrue(doc != null);
-  }
-
-
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/NarrativeGeneratorTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/NarrativeGeneratorTests.java
deleted file mode 100644
index 2204b756416..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/NarrativeGeneratorTests.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.hl7.fhir.r4.context.SimpleWorkerContext;
-import org.hl7.fhir.r4.formats.XmlParser;
-import org.hl7.fhir.r4.model.DomainResource;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.r4.utils.EOperationOutcome;
-import org.hl7.fhir.r4.utils.NarrativeGenerator;
-import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParserException;
-
-public class NarrativeGeneratorTests {
-
-	private NarrativeGenerator gen;
-	
-	@Before
-	public void setUp() throws FileNotFoundException, IOException, FHIRException {
-    if (TestingUtilities.context == null)
-      TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-		if (gen == null)
-  		gen = new NarrativeGenerator("", null, TestingUtilities.context);
-	}
-
-	@After
-	public void tearDown() {
-	}
-
-	@Test
-	public void test() throws FileNotFoundException, IOException, XmlPullParserException, EOperationOutcome, FHIRException {
-		process(Utilities.path(TestingUtilities.home(), "source", "questionnaireresponse", "questionnaireresponse-example-f201-lifelines.xml"));
-	}
-
-	private void process(String path) throws FileNotFoundException, IOException, XmlPullParserException, EOperationOutcome, FHIRException {
-	  XmlParser p = new XmlParser();
-	  DomainResource r = (DomainResource) p.parse(new FileInputStream(path));
-	  gen.generate(r);
-	  FileOutputStream s = new FileOutputStream(Utilities.path(TestingUtilities.temp(), "gen.xml"));
-    new XmlParser().compose(s, r, true);
-    s.close();
-	  
-  }
-
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ProfileUtilitiesTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ProfileUtilitiesTests.java
deleted file mode 100644
index eb93be56ff1..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ProfileUtilitiesTests.java
+++ /dev/null
@@ -1,940 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hl7.fhir.r4.conformance.ProfileComparer;
-import org.hl7.fhir.r4.conformance.ProfileComparer.ProfileComparison;
-import org.hl7.fhir.r4.conformance.ProfileUtilities;
-import org.hl7.fhir.r4.context.SimpleWorkerContext;
-import org.hl7.fhir.r4.formats.IParser.OutputStyle;
-import org.hl7.fhir.r4.formats.XmlParser;
-import org.hl7.fhir.r4.model.Base;
-import org.hl7.fhir.r4.model.CodeType;
-import org.hl7.fhir.r4.model.ElementDefinition;
-import org.hl7.fhir.r4.model.ElementDefinition.DiscriminatorType;
-import org.hl7.fhir.r4.model.ElementDefinition.SlicingRules;
-import org.hl7.fhir.r4.model.Enumerations.BindingStrength;
-import org.hl7.fhir.r4.model.Reference;
-import org.hl7.fhir.r4.model.StructureDefinition;
-import org.hl7.fhir.r4.model.StructureDefinition.TypeDerivationRule;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.r4.utils.EOperationOutcome;
-import org.hl7.fhir.exceptions.DefinitionException;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.exceptions.FHIRFormatError;
-import org.hl7.fhir.utilities.CSFile;
-import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.utilities.validation.ValidationMessage;
-import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
-import static org.junit.Assert.*;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r4.utils.SnomedExpressions;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class ProfileUtilitiesTests {
-
-//  private String root;
-//  private SimpleWorkerContext context;
-//  private ProfileComparer comp;
-//  
-////  public ProfileUtilitiesTests(String root) {
-////    super();
-////    this.root = root;
-////  }
-//
-////  public ProfileUtilitiesTests() {
-////    super();
-////    root = TestingUtilities.home();
-////    
-////  }
-//
-//  public static void main(String[] args) throws EOperationOutcome, Exception {
-//    // new ProfileUtilitiesTests().execute(args);
-//    ProfileUtilitiesTests put = new ProfileUtilitiesTests();
-//    put.root = "C:\\work\\org.hl7.fhir\\build\\publish";
-//    put.testSnapshotGeneration();
-//    //    StructureDefinition p = (StructureDefinition) new XmlParser().parse(new FileInputStream("C:\\work\\org.hl7.fhir\\build\\publish\\lipid-report-cholesterol.profile.xml"));
-//    //    new ProfileUtilities(context, messages, null).generateSchematrons(new FileOutputStream("c:\\temp\\test.sch"), p);
-//  }
-//  
-//  public void execute(String[] args) throws FileNotFoundException, IOException, FHIRException {
-//    System.out.println("loading context");
-//    context = SimpleWorkerContext.fromPack(Utilities.path(root, "validation.zip"));
-//    comp = new ProfileComparer(context);
-//    
-//    compare("patient-daf-dafpatient.profile.xml", "patient-qicore-qicore-patient.profile.xml");
-//    compare("encounter-daf-dafencounter.profile.xml", "encounter-qicore-qicore-encounter.profile.xml");
-//    compare("substance-daf-dafsubstance.profile.xml", "substance-qicore-qicore-substance.profile.xml");
-//    compare("medication-daf-dafmedication.profile.xml", "medication-qicore-qicore-medication.profile.xml");
-//    compare("procedure-daf-dafprocedure.profile.xml", "procedure-qicore-qicore-procedure.profile.xml");
-//    compare("familymemberhistory-daf-daffamilymemberhistory.profile.xml", "familymemberhistory-qicore-qicore-familymemberhistory.profile.xml");
-//    compare("immunization-daf-dafimmunization.profile.xml", "immunization-qicore-qicore-immunization.profile.xml");
-//    compare("condition-daf-dafcondition.profile.xml", "condition-qicore-qicore-condition.profile.xml");
-//    compare("allergyintolerance-daf-dafallergyintolerance.profile.xml", "allergyintolerance-qicore-qicore-allergyintolerance.profile.xml");
-//    compare("medicationadministration-daf-dafmedicationadministration.profile.xml", "medicationadministration-qicore-qicore-medicationadministration.profile.xml");
-//    compare("medicationdispense-daf-dafmedicationdispense.profile.xml", "medicationdispense-qicore-qicore-medicationdispense.profile.xml");
-//    compare("medicationprescription-daf-dafmedicationprescription.profile.xml", "medicationprescription-qicore-qicore-medicationprescription.profile.xml");
-//    compare("medicationstatement-daf-dafmedicationstatement.profile.xml", "medicationstatement-qicore-qicore-medicationstatement.profile.xml");
-//    compare("observation-daf-smokingstatus-dafsmokingstatus.profile.xml", "observation-qicore-qicore-observation.profile.xml");
-//    compare("observation-daf-vitalsigns-dafvitalsigns.profile.xml", "observation-qicore-qicore-observation.profile.xml");
-////    compare("observation-daf-results-dafresultobs.profile.xml", "observation-qicore-qicore-observation.profile.xml");
-////    compare("diagnosticorder-daf-dafdiagnosticorder.profile.xml", "diagnosticorder-qicore-qicore-diagnosticorder.profile.xml");
-////    compare("diagnosticreport-daf-dafdiagnosticreport.profile.xml", "diagnosticreport-qicore-qicore-diagnosticreport.profile.xml");
-//    
-//    System.out.println("processing output");
-//    for (ProfileComparison outcome : comp.getComparisons()) { 
-//      if (outcome.getSubset() != null)
-//        new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("C:\\temp\\intersection-"+outcome.getId()+".xml"), outcome.getSubset());
-//      if (outcome.getSuperset() != null)
-//        new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("C:\\temp\\union-"+outcome.getId()+".xml"), outcome.getSuperset());
-//    
-//      System.out.println("\r\n"+outcome.getId()+": Comparison of "+outcome.getLeft().getUrl()+" and "+outcome.getRight().getUrl());
-//      for (ValidationMessage vm : outcome.getMessages())
-//        if (vm.getLevel() == IssueSeverity.INFORMATION)
-//      System.out.println(vm.summary());
-//      for (ValidationMessage vm : outcome.getMessages())
-//        if (vm.getLevel() == IssueSeverity.WARNING)
-//          System.out.println(vm.summary());
-//      for (ValidationMessage vm : outcome.getMessages())
-//        if (vm.getLevel() == IssueSeverity.ERROR)
-//          System.out.println(vm.summary());
-//      for (ValidationMessage vm : outcome.getMessages())
-//        if (vm.getLevel() == IssueSeverity.FATAL)
-//          System.out.println(vm.summary());
-//      System.out.println("done. "+Integer.toString(outcome.getMessages().size())+" messages");
-//      System.out.println("=================================================================");
-//    }
-//	}
-//
-//  private void compare(String fn1, String fn2) throws FHIRFormatError, FileNotFoundException, IOException, DefinitionException {
-//    System.out.println("Compare "+fn1+" to "+fn2);
-//    System.out.println("  .. load");
-//    StructureDefinition left = (StructureDefinition) new XmlParser().parse(new FileInputStream(Utilities.path(root, fn1)));
-//    StructureDefinition right = (StructureDefinition) new XmlParser().parse(new FileInputStream(Utilities.path(root, fn2)));
-//    System.out.println(" .. compare");
-//    comp.compareProfiles(left, right);
-//    
-//  }
-//  
-//  public void testSnapshotGeneration() throws EOperationOutcome, Exception {
-//    System.out.println("Loading");
-//    context = SimpleWorkerContext.fromPack(Utilities.path(root, "definitions.xml.zip"));
-//    System.out.println("Loaded "+Integer.toString(context.totalCount())+" resources"); 
-//    
-//    // simple tests
-//    testSimple();
-//    testSimple2();
-//    testCardinalityChange();
-//    testDocumentationAppend();
-//    textTypeNarrowing1();
-//    textTypeNarrowing2();
-//    testMapping();
-//    
-//    // ok, now we test walking into a new type:
-//    testTypeWalk();
-//     // todo: testTypeWalk2();  
-//    
-//    // slicing tests
-//    testSlicingSimple();
-//    testSlicingExtension(false);
-//    testSlicingExtension(true);
-//    testSlicingExtensionComplex(true);
-//    testSlicingExtensionComplex(false);
-//    testSlicingTask8742();
-//    System.out.println("Success"); 
-//  }
-//
-//  /**
-//   * This is simple: we just create an empty differential, generate the snapshot, and then insist it must match the base 
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-  @Test
-  public void testSimple() throws FHIRException, FileNotFoundException, IOException {
-    if (TestingUtilities.context == null)
-      TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-
-    StructureDefinition focus = new StructureDefinition();
-    StructureDefinition base = TestingUtilities.context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-    focus.setUrl(Utilities.makeUuidUrn());
-    focus.setBaseDefinition(base.getUrl());
-    focus.setType("Patient");
-    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-    new ProfileUtilities(TestingUtilities.context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test");
-
-    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
-    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-      ElementDefinition b = base.getSnapshot().getElement().get(i);
-      ElementDefinition f = focus.getSnapshot().getElement().get(i);
-      if (ok) {
-        if (!f.hasBase()) 
-          ok = false;
-        else if (!b.getPath().equals(f.getPath())) 
-          ok = false;
-        else {
-          b.setBase(null);
-          f.setBase(null);
-          ok = Base.compareDeep(b, f, true);
-        }
-      }
-    }
-
-    if (!ok) {
-      compareXml(base, focus);
-      throw new FHIRException("Snap shot generation simple test failed");
-    } else 
-      System.out.println("Snap shot generation simple test passed");
-  }
-
-  
-//
-//  /**
-//   * This is simple: we just create an empty differential, generate the snapshot, and then insist it must match the base. for a different resource with recursion 
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-  @Test
-  public void testSimple2() throws EOperationOutcome, Exception {
-    if (TestingUtilities.context == null)
-      TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-
-    StructureDefinition focus = new StructureDefinition();
-    StructureDefinition base = TestingUtilities.context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/ValueSet").copy();
-    focus.setUrl(Utilities.makeUuidUrn());
-    focus.setBaseDefinition(base.getUrl());
-    focus.setType(base.getType());
-    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-    new ProfileUtilities(TestingUtilities.context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-
-    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
-    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-      if (ok) {
-        ElementDefinition b = base.getSnapshot().getElement().get(i);
-        ElementDefinition f = focus.getSnapshot().getElement().get(i);
-        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-          ok = false;
-        else {
-          f.setBase(null);
-          ok = Base.compareDeep(b, f, true);
-        }
-      }
-    }
-    
-    if (!ok) {
-      compareXml(base, focus);
-      throw new FHIRException("Snap shot generation simple test failed");
-    } else 
-      System.out.println("Snap shot generation simple test passed");
-  }
-
-//  /**
-//   * Change one cardinality.
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-//  private void testCardinalityChange() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier");
-//    id.setMin(1);
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.identifier")) {
-//            ok = f.getMin() == 1;
-//            if (ok)
-//              f.setMin(0);
-//          }
-//          ok = ok && Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation chenge cardinality test failed");
-//    } else 
-//      System.out.println("Snap shot generation chenge cardinality test passed");
-//  }
-//
-//  /**
-//   * check that documentation appending is working
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-//  private void testDocumentationAppend() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier");
-//    id.setDefinition("... some more doco");
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.identifier")) {
-//            ok = f.getDefinition().length() > b.getDefinition().length();
-//            if (ok) {
-//              f.setDefinition(null);
-//              b.setDefinition(null);
-//            }
-//          }
-//          ok = ok && Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation documentation append failed");
-//    } else 
-//      System.out.println("Snap shot generation documentation append test passed");
-//  }
-//
-//  
-//  /**
-//   * check that narrowing types is working
-//   * this one doesn't rename the path
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-//  private void textTypeNarrowing1() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.deceased[x]");
-//    id.addType().setCode("dateTime");
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.deceasedDateTime")) {
-//            ok = f.getType().size() == 1 && f.getType().get(0).getCode().equals("dateTime");
-//            if (ok) {
-//              f.getType().clear();
-//              b.getType().clear();
-//              f.setPath(b.getPath());
-//            }
-//          }
-//          ok = ok && Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation narrow type 1 failed");
-//    } else 
-//      System.out.println("Snap shot generation narrow type 1 test passed");
-//  }
-//  
-//  /**
-//   * check that narrowing types is working
-//   * this one renames the path
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-//  private void textTypeNarrowing2() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.deceasedDateTime");
-//    id.addType().setCode("dateTime");
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.deceasedDateTime")) {
-//            ok = f.getType().size() == 1 && f.getType().get(0).getCode().equals("dateTime");
-//            if (ok) {
-//              f.getType().clear();
-//              b.getType().clear();
-//              f.setPath(b.getPath());
-//            }
-//          }
-//          ok = ok && Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation narrow type 2 failed");
-//    } else 
-//      System.out.println("Snap shot generation narrow type 2 test passed");
-//  }
-//
-//  /**
-//   * check that mapping resolution is working
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-//  private void testMapping() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier");
-//    id.addMapping().setIdentity("rim").setMap("test");
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.identifier")) {
-//            ok = f.getMapping().size() > b.getMapping().size();
-//            if (ok) {
-//              f.getMapping().clear();
-//              b.getMapping().clear();
-//            }
-//          }
-//          ok = ok && Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation mapping changes failed");
-//    } else 
-//      System.out.println("Snap shot generation mapping changes test passed");
-//  }
-//
-//  /**
-//   * Walking into a type 
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-//  private void testTypeWalk() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier");
-//    id.setMustSupport(true);
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier.system");
-//    id.setMustSupport(true);
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    // the derived should be 8 longer
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size() - 8;
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i <= 9 ? i : i + 8);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.identifier")) {
-//            ok = f.getMustSupport() && !b.getMustSupport();
-//            if (ok) {
-//              f.setMustSupportElement(null);
-//            }
-//          }
-//          ok = Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation simple test failed");
-//    } else 
-//      System.out.println("Snap shot generation simple test passed");
-//  }
-//
-//  /**
-//   * Walking into a type, without explicitly doing so 
-//   * 
-//   * note: this currently fails.
-//   * 
-//   * @param context2
-//   * @
-//   * @throws EOperationOutcome 
-//   */
-//  private void testTypeWalk2() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier.system");
-//    id.setMustSupport(true);
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    // the derived should be 8 longer
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size() - 8;
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i <= 9 ? i : i + 8);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.identifier")) {
-//            ok = f.getMustSupport() && !b.getMustSupport();
-//            if (ok) {
-//              f.setMustSupportElement(null);
-//            }
-//          }
-//          ok = Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation simple test failed");
-//    } else 
-//      System.out.println("Snap shot generation simple test passed");
-//  }
-//
-//  
-//  /**
-//   * we're going to slice Patient.identifier
-//   */
-//  private void testSlicingSimple() throws EOperationOutcome, Exception {
-//    
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    
-//    // set the slice up
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier");
-//    id.getSlicing().setOrdered(false).setRules(SlicingRules.OPEN).addDiscriminator().setPath("use").setType(DiscriminatorType.VALUE);
-//    
-//    // first slice: 
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier");
-//    id.setSliceName("name1");
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier.use");
-//    id.setFixed(new CodeType("usual"));
-//    
-//    // second slice:
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier");
-//    id.setSliceName("name2");
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.identifier.use");
-//    id.setFixed(new CodeType("official"));
-//    
-//    
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    // 18 different: identifier + 8 inner children * 2 
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size() - 18;
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i <= 9 ? i : i + 18);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.identifier")) {
-//            ok = f.hasSlicing();
-//            if (ok)
-//              f.setSlicing(null);
-//          }            
-//          ok = Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    // now, check that the slices we skipped are correct:
-//    for (int i = 10; i <= 18; i++) {
-//      if (ok) {
-//        ElementDefinition d1 = focus.getSnapshot().getElement().get(i);
-//        ElementDefinition d2 = focus.getSnapshot().getElement().get(i+9);
-//        if (d1.getPath().equals("Patient.identifier.use")) {
-//          ok = d1.hasFixed() && d2.hasFixed() && !Base.compareDeep(d1.getFixed(), d2.getFixed(), true);
-//          if (ok) {
-//            d1.setFixed(null);
-//            d2.setFixed(null);
-//          }
-//        }
-//        if (d1.getPath().equals("Patient.identifier")) {
-//          ok = d1.hasSliceName() && d2.hasSliceName() && !Base.compareDeep(d1.getSliceNameElement(), d2.getSliceNameElement(), true);
-//          if (ok) {
-//            d1.setSliceName(null);
-//            d2.setSliceName(null);
-//          }
-//        }
-//        ok = Base.compareDeep(d1, d2, true);
-//      }
-//    }
-//    // for throughness, we could check against identifier too, but this is not done now.
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation slicing failed");
-//    } else 
-//      System.out.println("Snap shot generation slicing passed");
-//    
-//  }
-//
-//  /**
-//   * we're going to slice Patient.extension and refer to extension by profile
-//   * 
-//   * implicit: whether to rely on implicit extension slicing
-//   */
-//  private void testSlicingExtension(boolean implicit) throws EOperationOutcome, Exception {
-//    
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    
-//    // set the slice up
-//    ElementDefinition id;
-//    if (!implicit) {
-//      id = focus.getDifferential().addElement();
-//      id.setPath("Patient.extension");
-//      id.getSlicing().setOrdered(false).setRules(SlicingRules.OPEN).addDiscriminator().setPath("url").setType(DiscriminatorType.VALUE);
-//      id.setMax("3");
-//    }
-//    // first slice: 
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.extension");
-//    id.setSliceName("name1");
-//    id.addType().setCode("Extension").setProfile("http://hl7.org/fhir/StructureDefinition/patient-birthTime");
-//    id.setMin(1);
-//    
-//    // second slice:
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.extension");
-//    id.setSliceName("name2");
-//    id.addType().setCode("Extension").setProfile("http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName");    
-//    
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    ProfileUtilities pu = new ProfileUtilities(context, messages, null);
-//    pu.generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    // 2 different: extension slices 
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size() - 2;
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i <= 7 ? i : i + 2);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.extension")) {
-//            ok = f.hasSlicing() && (implicit || f.getMax().equals("3"));
-//            if (ok) {
-//              f.setSlicing(null);
-//              f.setMaxElement(b.getMaxElement());
-//            }
-//          }            
-//          if (!f.getPath().equals("Patient.extension")) // no compare that because the definitions get overwritten 
-//            ok = Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    // now, check that the slices we skipped are correct:
-//    if (ok) {
-//      ElementDefinition d1 = focus.getSnapshot().getElement().get(8);
-//      ElementDefinition d2 = focus.getSnapshot().getElement().get(9);
-//      ok = d1.hasType() && d1.getType().get(0).hasProfile() && d2.hasType() && d2.getType().get(0).hasProfile() && !Base.compareDeep(d1.getType(), d2.getType(), true) &&
-//            d1.getMin() == 1 && d2.getMin() == 0 && d1.getMax().equals("1") && d2.getMax().equals("1");
-//      if (ok) {
-//        d1.getType().clear();
-//        d2.getType().clear();
-//        d1.setSliceName("x");
-//        d2.setSliceName("x");
-//        d1.setMin(0);
-//      }
-//      ok = Base.compareDeep(d1, d2, true);
-//      // for throughness, we could check against extension too, but this is not done now.
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation slicing extensions simple ("+(implicit ? "implicit" : "not implicit")+") failed");
-//    } else 
-//      System.out.println("Snap shot generation slicing extensions simple ("+(implicit ? "implicit" : "not implicit")+") passed");
-//  }
-//
-//  /**
-//   * we're going to slice Patient.extension and refer to extension by profile. one of the extensions is complex, and we're going to walk into 
-//   * it and make it must support
-//   * 
-//   * implicit: whether to rely on implicit extension slicing
-//   */
-//  private void testSlicingExtensionComplex(boolean implicit) throws EOperationOutcome, Exception {
-//    
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    
-//    // set the slice up
-//    ElementDefinition id;
-//    if (!implicit) {
-//      id = focus.getDifferential().addElement();
-//      id.setPath("Patient.extension");
-//      id.getSlicing().setOrdered(false).setRules(SlicingRules.OPEN).addDiscriminator().setPath("url").setType(DiscriminatorType.VALUE);
-//    }
-//    // first slice  - a simple one to get us going: 
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.extension");
-//    id.setSliceName("simple");
-//    id.addType().setCode("Extension").setProfile("http://hl7.org/fhir/StructureDefinition/patient-birthTime");
-//    
-//    // second slice - the complex one
-//    // we walk into this and fix properties on the inner extensions
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.extension");
-//    id.setSliceName("complex");
-//    id.addType().setCode("Extension").setProfile("http://hl7.org/fhir/StructureDefinition/patient-nationality");
-//    if (!implicit) {
-//      id = focus.getDifferential().addElement();
-//      id.setPath("Patient.extension.extension");
-//      id.getSlicing().setOrdered(false).setRules(SlicingRules.OPEN).addDiscriminator().setPath("url").setType(DiscriminatorType.VALUE);
-//    }
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.extension.extension");
-//    id.setSliceName("code");
-//    id.setMustSupport(true);
-//    id.addType().setCode("Extension").setProfile("http://hl7.org/fhir/StructureDefinition/patient-nationality#code");
-//    
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Patient.extension.extension");
-//    id.setSliceName("period");
-//    id.addType().setCode("Extension").setProfile("http://hl7.org/fhir/StructureDefinition/patient-nationality#period");
-//    id.setMax("0"); // prohibit this one....
-//        
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    // ok, there's going to 1 (simple) + complex: 1 + id + extnesion.slice + extension.code + (4 inside from that) + extension.period + (4 inside from that) + value + url = 16
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size() - 16;
-//    
-//    // custom checks
-//    ok = ok && rule(focus.getSnapshot().getElement().get(7).getPath().equals("Patient.extension"), "element 7 (base) path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(7).hasSlicing(), "element 7 slicing");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(8).getPath().equals("Patient.extension"), "element 8 (1st slice) path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(8).getSliceName().equals("simple"), "element 8 (1st slice) name");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(8).getType().get(0).getProfile().equals("http://hl7.org/fhir/StructureDefinition/patient-birthTime"), "element 9 (2nd slice) profile name");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(9).getPath().equals("Patient.extension"), "element 9 (2nd slice) path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(9).getSliceName().equals("complex"), "element 8 (1st slice) name");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(9).getType().get(0).getProfile().equals("http://hl7.org/fhir/StructureDefinition/patient-nationality"), "element 9 (2nd slice) profile name");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(10).getPath().equals("Patient.extension.id"), "element 10 (2nd slice).id path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(11).getPath().equals("Patient.extension.extension"), "element 11 (2nd slice).extension path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(12).getPath().equals("Patient.extension.extension"), "element 12 (2nd slice).extension path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(12).getMustSupport(), "element 12 (2nd slice).extension must support");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(13).getPath().equals("Patient.extension.extension.id"), "element 13 (2nd slice).extension.id path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(14).getPath().equals("Patient.extension.extension.extension"), "element 14 (2nd slice).extension.extension path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(15).getPath().equals("Patient.extension.extension.url"), "element 15 (2nd slice).extension.url path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(16).getPath().equals("Patient.extension.extension.valueCodeableConcept"), "element 16 (2nd slice).extension.valueCodeableConcept path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(17).getPath().equals("Patient.extension.extension"), "element 17 (2nd slice).extension path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(17).getMax().equals("0"), "element 17 (2nd slice).extension cardinality");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(18).getPath().equals("Patient.extension.extension.id"), "element 18 (2nd slice).extension.id path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(19).getPath().equals("Patient.extension.extension.extension"), "element 19 (2nd slice).extension.extension path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(20).getPath().equals("Patient.extension.extension.url"), "element 20 (2nd slice).extension.url path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(21).getPath().equals("Patient.extension.extension.valuePeriod"), "element 21 (2nd slice).extension.valuePeriod path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(22).getPath().equals("Patient.extension.url"), "element 22 (2nd slice).url path");
-//    ok = ok && rule(focus.getSnapshot().getElement().get(23).getPath().equals("Patient.extension.value[x]"), "element 23 (2nd slice).url path");
-//
-//    for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
-//      if (ok) {
-//        ElementDefinition b = base.getSnapshot().getElement().get(i);
-//        ElementDefinition f = focus.getSnapshot().getElement().get(i <= 7 ? i : i + 16);
-//        if (!f.hasBase() || !b.getPath().equals(f.getBase().getPath())) 
-//          ok = false;
-//        else {
-//          f.setBase(null);
-//          if (f.getPath().equals("Patient.extension")) {
-//            ok = f.hasSlicing();
-//            if (ok)
-//              f.setSlicing(null);
-//          }            
-//          if (!f.getPath().equals("Patient.extension")) // no compare that because the definitions get overwritten 
-//            ok = Base.compareDeep(b, f, true);
-//        }
-//      }
-//    }
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation slicing extensions complex ("+(implicit ? "implicit" : "not implicit")+") failed");
-//    } else 
-//      System.out.println("Snap shot generation slicing extensions complex ("+(implicit ? "implicit" : "not implicit")+") passed");
-//  }
-//
-//  private void testSlicingTask8742() throws EOperationOutcome, Exception {
-//    StructureDefinition focus = new StructureDefinition();
-//    StructureDefinition base = context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Organization").copy();
-//    focus.setUrl(Utilities.makeUuidUrn());
-//    focus.setBaseDefinition(base.getUrl());
-//    focus.setType(base.getType());
-//    focus.setDerivation(TypeDerivationRule.CONSTRAINT);
-//    
-//    ElementDefinition id = focus.getDifferential().addElement();
-//    id.setPath("Organization.address");
-//    id.setMin(1);
-//    id.setMax("1");
-//    id.setMustSupport(true);
-//        
-//    id = focus.getDifferential().addElement();
-//    id.setPath("Organization.address.extension");
-//    id.setSliceName("USLabCountycodes");
-//    id.getSlicing().setOrdered(false).setRules(SlicingRules.OPEN).addDiscriminator().setPath("url").setType(DiscriminatorType.VALUE);
-//    id.setShort("County/Parish FIPS codes");
-//    id.setDefinition("County/Parish FIPS codes.");
-//    id.setRequirements("County/Parish Code SHALL use FIPS 6-4  ( INCITS 31:2009).");
-//    id.setMin(0);
-//    id.setMax("1");
-//    id.addType().setCode("Extension").setProfile("http://hl7.org/fhir/StructureDefinition/us-core-county");
-//    id.setMustSupport(true);
-//    id.getBinding().setStrength(BindingStrength.REQUIRED).setDescription("FIPS codes for US counties and county equivalent entities.").setValueSet(new Reference().setReference("http://hl7.org/fhir/ValueSet/fips-county"));
-//    List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-//    
-//    new ProfileUtilities(context, messages, null).generateSnapshot(base, focus, focus.getUrl(), "Simple Test" );
-//
-//    // 14 for address with one sliced extension
-//    boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size() - 13;
-//    
-//    if (!ok) {
-//      compareXml(base, focus);
-//      throw new FHIRException("Snap shot generation test 8742 failed");
-//    } else 
-//      System.out.println("Snap shot generation test 8742 passed");
-//  }
-//
-//
-//  private boolean rule(boolean ok, String message) {
-//    if (!ok)
-//      System.out.println("Test failed: " + message);
-//    return ok;
-//  }
-//
-
-  private void compareXml(StructureDefinition base, StructureDefinition focus) throws FileNotFoundException, IOException {
-    base.setText(null);
-    focus.setText(null);
-    base.setDifferential(null);
-//    focus.setDifferential(null);
-    String f1 = Utilities.path("c:", "temp", "base.xml");
-    String f2 = Utilities.path("c:", "temp", "derived.xml");
-    new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(f1), base);;
-    new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(f2), focus);;
-    String diff = Utilities.path(System.getenv("ProgramFiles(X86)"), "WinMerge", "WinMergeU.exe");
-    List<String> command = new ArrayList<String>();
-    command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\"");
-
-    ProcessBuilder builder = new ProcessBuilder(command);
-    builder.directory(new CSFile("c:\\temp"));
-    builder.start();
-  }
-  
-  
-  
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ResourceRoundTripTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ResourceRoundTripTests.java
deleted file mode 100644
index 980022e7fa2..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ResourceRoundTripTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import static org.junit.Assert.*;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.hl7.fhir.r4.context.IWorkerContext;
-import org.hl7.fhir.r4.context.SimpleWorkerContext;
-import org.hl7.fhir.r4.formats.IParser.OutputStyle;
-import org.hl7.fhir.r4.formats.XmlParser;
-import org.hl7.fhir.r4.model.DomainResource;
-import org.hl7.fhir.r4.model.Resource;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.r4.utils.EOperationOutcome;
-import org.hl7.fhir.r4.utils.NarrativeGenerator;
-import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ResourceRoundTripTests {
-
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @Test
-  public void test() throws FileNotFoundException, IOException, FHIRException, EOperationOutcome {
-    if (TestingUtilities.context == null)
-      TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-    Resource res = new XmlParser().parse(new FileInputStream(Utilities.path(TestingUtilities.home(), "tests", "resources", "unicode.xml")));
-    new NarrativeGenerator("", "", TestingUtilities.context).generate((DomainResource) res);
-    new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(TestingUtilities.home(), "tests", "resources","unicode.out.xml")), res);
-  }
-
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ShexGeneratorTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ShexGeneratorTests.java
deleted file mode 100644
index fe7fbca31ee..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/ShexGeneratorTests.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-
-import org.hl7.fhir.r4.conformance.ShExGenerator;
-import org.hl7.fhir.r4.conformance.ShExGenerator.HTMLLinkPolicy;
-import org.hl7.fhir.r4.context.SimpleWorkerContext;
-import org.hl7.fhir.r4.model.StructureDefinition;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.utilities.TextFile;
-import org.junit.Test;
-
-public class ShexGeneratorTests {
-
-  private void doTest(String name) throws FileNotFoundException, IOException, FHIRException {
-    String workingDirectory = "C:\\work\\org.hl7.fhir\\build\\publish"; // FileSystems.getDefault().getPath(System.getProperty("user.dir"), "data").toString();
-    // String workingDirectory = FileSystems.getDefault().getPath(System.getProperty("user.dir"), "..", "..", "..", "publish").toString();
-    if (TestingUtilities.context == null) {
-      // For the time being, put the validation entry in org/hl7/fhir/r4/data
-      Path path = FileSystems.getDefault().getPath(workingDirectory, "definitions.xml.zip");
-      TestingUtilities.context = SimpleWorkerContext.fromPack(path.toString());
-    }
-    StructureDefinition sd = TestingUtilities.context.fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/"+name);
-    if(sd == null) {
-      throw new FHIRException("StructuredDefinition for " + name + "was null");
-    }
-    Path outPath = FileSystems.getDefault().getPath(workingDirectory, name.toLowerCase()+".shex");
-    TextFile.stringToFile(new ShExGenerator(TestingUtilities.context).generate(HTMLLinkPolicy.NONE, sd), outPath.toString());
-  }
-
-  @Test
-  public void testId() throws FHIRException, IOException {
-    doTest("id");
-  }
-
-  @Test
-  public void testUri() throws FHIRException, IOException {
-    doTest("uri");
-  }
-
-
-  @Test
-  public void testObservation() throws FHIRException, IOException {
-    doTest("Observation");
-  }
-
-  @Test
-  public void testRef() throws FHIRException, IOException {
-    doTest("Reference");
-  }
-
-  @Test
-  public void testAccount() throws FHIRException, IOException {
-    doTest("Account");
-  }
-
-  @Test
-  public void testMedicationOrder() throws FHIRException, IOException {
-    doTest("MedicationOrder");
-  }
-
-  @Test
-  public void testAllergyIntolerance() throws FHIRException, IOException {
-    doTest("AllergyIntolerance");
-  }
-
-  @Test
-  public void testCoding() throws FHIRException, IOException {
-    doTest("Coding");
-  }
-
-  @Test
-  public void testTiming() throws FHIRException, IOException {
-    doTest("Timing");
-  }
-
-  @Test
-  public void testSignature() throws FHIRException, IOException {
-    doTest("Signature");
-  }
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/SnapShotGenerationTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/SnapShotGenerationTests.java
deleted file mode 100644
index ce48cca0090..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/SnapShotGenerationTests.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.hl7.fhir.r4.conformance.ProfileUtilities;
-import org.hl7.fhir.r4.context.SimpleWorkerContext;
-import org.hl7.fhir.r4.formats.IParser.OutputStyle;
-import org.hl7.fhir.r4.formats.XmlParser;
-import org.hl7.fhir.r4.model.Base;
-import org.hl7.fhir.r4.model.BooleanType;
-import org.hl7.fhir.r4.model.Coding;
-import org.hl7.fhir.r4.model.ExpressionNode;
-import org.hl7.fhir.r4.model.MetadataResource;
-import org.hl7.fhir.r4.model.ExpressionNode.CollectionStatus;
-import org.hl7.fhir.r4.model.PrimitiveType;
-import org.hl7.fhir.r4.model.Resource;
-import org.hl7.fhir.r4.model.StructureDefinition;
-import org.hl7.fhir.r4.model.TestScript;
-import org.hl7.fhir.r4.model.TestScript.SetupActionAssertComponent;
-import org.hl7.fhir.r4.model.TestScript.SetupActionComponent;
-import org.hl7.fhir.r4.model.TestScript.SetupActionOperationComponent;
-import org.hl7.fhir.r4.model.TestScript.TestActionComponent;
-import org.hl7.fhir.r4.model.TestScript.TestScriptFixtureComponent;
-import org.hl7.fhir.r4.model.TestScript.TestScriptTestComponent;
-import org.hl7.fhir.r4.model.TypeDetails;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.r4.utils.CodingUtilities;
-import org.hl7.fhir.r4.utils.FHIRPathEngine;
-import org.hl7.fhir.r4.utils.FHIRPathEngine.IEvaluationContext;
-import org.hl7.fhir.exceptions.DefinitionException;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.exceptions.FHIRFormatError;
-import org.hl7.fhir.exceptions.PathEngineException;
-import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.utilities.xml.XMLUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import junit.framework.Assert;
-
-@RunWith(Parameterized.class)
-public class SnapShotGenerationTests {
-
-  private static class SnapShotGenerationTestsContext implements IEvaluationContext {
-    private Map<String, Resource> fixtures;
-    private Map<String, StructureDefinition> snapshots = new HashMap<String, StructureDefinition>();
-    public TestScript tests;
-
-    public void checkTestsDetails() {
-      if (!"http://hl7.org/fhir/tests/snapshotgeneration".equals(tests.getUrl()))
-        throw new Error("Wrong URL on test script");
-      if (!tests.getSetup().isEmpty())
-        throw new Error("Setup is not supported");
-      if (!tests.getTeardown().isEmpty())
-        throw new Error("Teardown is not supported");
-      Set<String> ids = new HashSet<String>();
-      Set<String> urls = new HashSet<String>();
-      for (Resource r : tests.getContained()) {
-        if (ids.contains(r.getId()))
-          throw new Error("Unsupported: duplicate contained resource on fixture id  "+r.getId());
-        ids.add(r.getId());
-        if (r instanceof MetadataResource) {
-          MetadataResource md = (MetadataResource) r;
-          if (urls.contains(md.getUrl()))
-            throw new Error("Unsupported: duplicate canonical url "+md.getUrl()+" on fixture id  "+r.getId());
-          urls.add(md.getUrl());
-        }
-      }
-      for (TestScriptFixtureComponent r : tests.getFixture()) {
-        if (ids.contains(r.getId()))
-          throw new Error("Unsupported: duplicate contained resource or fixture id  "+r.getId());
-        ids.add(r.getId());
-      }
-      Set<String> names = new HashSet<String>();
-      for (TestScriptTestComponent test : tests.getTest()) {
-        if (names.contains(test.getName()))
-          throw new Error("Unsupported: duplicate name "+test.getName());
-        names.add(test.getName());
-        if (test.getAction().size() < 2)
-          throw new Error("Unsupported: multiple actions required");
-        if (!test.getActionFirstRep().hasOperation())
-          throw new Error("Unsupported: first action must be an operation");
-        for (int i = 0; i < test.getAction().size(); i++) {
-//          if (!test.getAction().get(i).hasAssert())
-//            throw new Error("Unsupported: following actions must be an asserts");
-          TestActionComponent action = test.getAction().get(i);
-          if (action.hasOperation()) {
-            SetupActionOperationComponent op = test.getActionFirstRep().getOperation();
-            if (!CodingUtilities.matches(op.getType(), "http://hl7.org/fhir/testscript-operation-codes", "snapshot")
-            && !CodingUtilities.matches(op.getType(), "http://hl7.org/fhir/testscript-operation-codes", "sortDifferential"))
-              throw new Error("Unsupported action operation type "+CodingUtilities.present(op.getType()));
-            if (!"StructureDefinition".equals(op.getResource()))
-              throw new Error("Unsupported action operation resource "+op.getResource());
-            if (!op.hasResponseId())
-              throw new Error("Unsupported action operation: no response id");
-            if (!op.hasSourceId())
-              throw new Error("Unsupported action operation: no source id");
-            if (!hasSource(op.getSourceId()))
-              throw new Error("Unsupported action operation: source id could not be resolved");
-          } else if (action.hasAssert()) {
-            SetupActionAssertComponent a = action.getAssert();
-            if (!a.hasLabel())
-              throw new Error("Unsupported: actions must have a label");
-            if (!a.hasDescription())
-              throw new Error("Unsupported: actions must have a description");
-            if (!a.hasExpression())
-              throw new Error("Unsupported: actions must have an expression");
-          } else {
-            throw new Error("Unsupported: Unrecognized action type");            
-          }
-        }
-      }
-    }
-
-    private boolean hasSource(String sourceId) {
-      for (TestScriptFixtureComponent ds : tests.getFixture()) {
-        if (sourceId.equals(ds.getId()))
-          return true;
-      }
-      for (Resource r : tests.getContained()) {
-        if (sourceId.equals(r.getId()))
-          return true;
-      }
-      return false;
-    }
-
-    public Resource fetchFixture(String id) {
-      if (fixtures.containsKey(id))
-        return fixtures.get(id);
-      
-      for (TestScriptFixtureComponent ds : tests.getFixture()) {
-        if (id.equals(ds.getId()))
-          throw new Error("not done yet");
-      }
-      for (Resource r : tests.getContained()) {
-        if (id.equals(r.getId()))
-          return r;
-      }
-      return null;
-    }
-
-    // FHIRPath methods
-    @Override
-    public Base resolveConstant(Object appContext, String name) throws PathEngineException {
-      return null;
-    }
-
-    @Override
-    public TypeDetails resolveConstantType(Object appContext, String name) throws PathEngineException {
-      return null;
-    }
-
-    @Override
-    public boolean log(String argument, List<Base> focus) {
-      System.out.println(argument+": "+fp.convertToString(focus));
-      return true;
-    }
-
-    @Override
-    public FunctionDetails resolveFunction(String functionName) {
-      if ("fixture".equals(functionName))
-        return new FunctionDetails("Access a fixture defined in the testing context", 0, 1);
-      return null;
-    }
-
-    @Override
-    public TypeDetails checkFunction(Object appContext, String functionName, List<TypeDetails> parameters) throws PathEngineException {
-      if ("fixture".equals(functionName))
-        return new TypeDetails(CollectionStatus.SINGLETON, TestingUtilities.context.getResourceNamesAsSet());
-      return null;
-    }
-
-    @Override
-    public List<Base> executeFunction(Object appContext, String functionName, List<List<Base>> parameters) {
-      if ("fixture".equals(functionName)) {
-        String id = fp.convertToString(parameters.get(0));
-        Resource res = fetchFixture(id);
-        if (res != null) {
-          List<Base> list = new ArrayList<Base>();
-          list.add(res);
-          return list;
-        }
-      }
-      return null;
-    }
-
-    @Override
-    public Base resolveReference(Object appContext, String url) {
-      // TODO Auto-generated method stub
-      return null;
-    }
-
-  }
-
-
-  private static FHIRPathEngine fp;
-
-  @Parameters(name = "{index}: file {0}")
-  public static Iterable<Object[]> data() throws ParserConfigurationException, IOException, FHIRFormatError {
-    SnapShotGenerationTestsContext context = new SnapShotGenerationTestsContext();
-    context.tests = (TestScript) new XmlParser().parse(new FileInputStream(Utilities.path(TestingUtilities.home(), "tests", "resources", "snapshot-generation-tests.xml")));
-
-    context.checkTestsDetails();
-
-    List<Object[]> objects = new ArrayList<Object[]>(context.tests.getTest().size());
-
-    for (TestScriptTestComponent e : context.tests.getTest()) {
-      objects.add(new Object[] { e.getName(), e, context });
-    }
-    return objects;
-  }
-
-
-  private final TestScriptTestComponent test;
-  private final String name;
-  private SnapShotGenerationTestsContext context;
-
-  public SnapShotGenerationTests(String name, TestScriptTestComponent e, SnapShotGenerationTestsContext context) {
-    this.name = name;
-    this.test = e;
-    this.context = context;
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void test() throws FileNotFoundException, IOException, FHIRException, org.hl7.fhir.exceptions.FHIRException {
-    if (TestingUtilities.context == null)
-      TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-    if (fp == null)
-      fp = new FHIRPathEngine(TestingUtilities.context);
-    fp.setHostServices(context);
-
-    resolveFixtures();
-    
-    for (int i = 0; i < test.getAction().size(); i++) {
-      TestActionComponent action = test.getAction().get(i);
-      if (action.hasOperation()) {
-        SetupActionOperationComponent op = action.getOperation();
-        Coding opType = op.getType();
-        if (opType.getSystem().equals("http://hl7.org/fhir/testscript-operation-codes") && opType.getCode().equals("snapshot")) {
-          StructureDefinition source = (StructureDefinition) context.fetchFixture(op.getSourceId());
-          StructureDefinition base = getSD(source.getBaseDefinition()); 
-          StructureDefinition output = source.copy();
-          ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context, null, null);
-          pu.setIds(source, false);
-          if ("sort=true".equals(op.getParams())) {
-            List<String> errors = new ArrayList<String>();
-            pu.sortDifferential(base, output, source.getName(), errors);
-            if (errors.size() > 0)
-              throw new FHIRException("Sort failed: "+errors.toString());
-          }
-          pu.generateSnapshot(base, output, source.getUrl(), source.getName());
-          context.fixtures.put(op.getResponseId(), output);
-          context.snapshots.put(output.getUrl(), output);
-          
-          new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(System.getProperty("java.io.tmpdir"), op.getResponseId()+".xml")), output);
-          
-        } else if (opType.getSystem().equals("http://hl7.org/fhir/testscript-operation-codes") && opType.getCode().equals("sortDifferential")) {
-          StructureDefinition source = (StructureDefinition) context.fetchFixture(op.getSourceId());
-          StructureDefinition base = getSD(source.getBaseDefinition()); 
-          StructureDefinition output = source.copy();
-          ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context, null, null);
-          pu.setIds(source, false);
-          List<String> errors = new ArrayList<String>();          
-          pu.sortDifferential(base, output, output.getUrl(), errors);
-          if (!errors.isEmpty())
-            throw new FHIRException(errors.get(0));
-          context.fixtures.put(op.getResponseId(), output);
-          context.snapshots.put(output.getUrl(), output);
-          
-          new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(System.getProperty("java.io.tmpdir"), op.getResponseId()+".xml")), output);
-            
-        } else {
-          throw new Error("Unsupported operation: " + opType.getSystem() + " : " + opType.getCode());
-        }
-      } else if (action.hasAssert()) {
-        SetupActionAssertComponent a = action.getAssert();
-        Assert.assertTrue(a.getLabel()+": "+a.getDescription(), fp.evaluateToBoolean(new StructureDefinition(), new StructureDefinition(), a.getExpression()));
-      }
-    }
-  }
-
-
-  private StructureDefinition getSD(String url) throws DefinitionException, FHIRException {
-    StructureDefinition sd = TestingUtilities.context.fetchResource(StructureDefinition.class, url);
-    if (sd == null)
-      sd = context.snapshots.get(url);
-    if (sd == null)
-      sd = findContainedProfile(url);
-    return sd;
-  }
-
-  private StructureDefinition findContainedProfile(String url) throws DefinitionException, FHIRException {
-    for (Resource r : context.tests.getContained()) {
-      if (r instanceof StructureDefinition) {
-        StructureDefinition sd = (StructureDefinition) r;
-        if  (sd.getUrl().equals(url)) {
-          StructureDefinition p = sd.copy();
-          ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context, null, null);
-          pu.setIds(p, false);
-          List<String> errors = new ArrayList<String>();          
-          pu.sortDifferential(getSD(p.getBaseDefinition()), p, url, errors);
-          if (!errors.isEmpty())
-            throw new FHIRException(errors.get(0));
-          pu.generateSnapshot(getSD(p.getBaseDefinition()), p, p.getUrl(), p.getName());
-          return p;
-        }
-      }
-    }
-    return null;
-  }
-
-  private void resolveFixtures() {
-    if (context.fixtures == null) {
-      context.fixtures = new HashMap<String, Resource>();
-      for (TestScriptFixtureComponent fd : context.tests.getFixture()) {
-        Resource r = TestingUtilities.context.fetchResource(Resource.class, fd.getResource().getReference());
-        context.fixtures.put(fd.getId(), r);
-      }
-    }
-
-  }
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/SnomedExpressionsTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/SnomedExpressionsTests.java
deleted file mode 100644
index fc9a61553ff..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/SnomedExpressionsTests.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import static org.junit.Assert.*;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r4.utils.SnomedExpressions;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class SnomedExpressionsTests {
-
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @Test
-  public void test() throws FHIRException {
-    p("116680003");
-    p("128045006:{363698007=56459004}");
-    p("128045006|cellulitis (disorder)|:{363698007|finding site|=56459004|foot structure|}");
-    p("31978002: 272741003=7771000");
-    p("31978002|fracture of tibia|: 272741003|laterality|=7771000|left|");
-    p("64572001|disease|:{116676008|associated morphology|=72704001|fracture|,363698007|finding site|=(12611008|bone structure of  tibia|:272741003|laterality|=7771000|left|)}");
-    p("417662000|past history of clinical finding|:246090004|associated finding|=      (31978002|fracture of tibia|: 272741003|laterality|=7771000|left|)");
-    p("243796009|situation with explicit context|:246090004|associated finding|=    (64572001|disease|:{116676008|associated morphology|=72704001|fracture|,"+"    363698007|finding site|=(12611008|bone structure of tibia|:    272741003|laterality|=7771000|left|)}),408729009|finding context|=    "+"410515003|known present|,408731000|temporal context|=410513005|past|,    408732007|subject relationship context|=410604004|subject of record|");
-
-    // from IHTSDO expression documentation:
-    p("125605004 |fracture of bone|");
-    p("284003005 |bone injury| :{ 363698007 |finding site| = 272673000 |bone structure|,116676008 |associated morphology| = 72704001 |fracture| }");
-    p("421720008 |spray dose form| + 7946007 |drug suspension|");
-    p("182201002 |hip joint| : 272741003 |laterality| = 24028007 |right|");
-    p("397956004 |prosthetic arthroplasty of the hip| : 363704007 |procedure site| = (182201002 |hip joint| : 272741003 |laterality| = 24028007 |right|)");
-    p("71388002 |procedure| : {260686004 |method| = 129304002 |excision - action|, 405813007 |procedure site - direct| = 28231008 |gallbladder structure|}, {260686004 |method| = 281615006 "+"|exploration|, 405813007 |procedure site - direct| = 28273000 |bile duct structure|}");
-    p("27658006 |amoxicillin|:411116001 |has dose form| = 385049006 |capsule|,{ 127489000 |has active ingredient| = 372687004 |amoxicillin|,111115 |has basis of strength| = (111115 |"+"amoxicillin only|:111115 |strength magnitude| = #500,111115 |strength unit| = 258684004 |mg|)}");
-    p("91143003 |albuterol|:411116001 |has dose form| = 385023001 |oral solution|,{ 127489000 |has active ingredient| = 372897005 |albuterol|,111115 |has basis of strength| = (111115 |a"+"lbuterol only|:111115 |strength magnitude| = #0.083,111115 |strength unit| = 118582008 |%|)}");
-    p("322236009 |paracetamol 500mg tablet| : 111115 |trade name| = \"PANADOL\"");
-    p("=== 46866001 |fracture of lower limb| + 428881005 |injury of tibia| :116676008 |associated morphology| = 72704001 |fracture|,363698007 |finding site| = 12611008 |bone structure of tibia|");
-    p("<<< 73211009 |diabetes mellitus| : 363698007 |finding site| = 113331007 |endocrine system|");
-
-    // from Overview of Expression Normalization, Equivalence and Subsumption Testing
-
-    p("28012007 |Closed fracture of shaft of tibia|");
-    p("125605004 |Fracture of bone| :{ 363698007 |Finding site| = 52687003 |Bone structure of shaft of tibia|,116676008 |Associated morphology| = 20946005 |Fracture, closed | }");
-    p("423125000 |Closed fracture of bone|:363698007 |Finding site| = 52687003 |Bone structure of shaft of tibia|");
-    p("6990005 |Fracture of shaft of tibia |: 116676008 |Associated morphology| = 20946005 |Fracture, closed |");
-    p("64572001 |Disease| : { 363698007 |Finding site| = 52687003 |Bone structure of shaft of tibia|, 116676008 |Associated morphology| = 20946005 |Fracture, closed | }");
-   // p("10925361000119108 |Closed fracture of shaft of left tibia|"); //  US Extension
-    p("28012007 |Closed fracture of shaft of tibia| : 363698007 |Finding site| = (52687003 |Bone structure of shaft of tibia| : 272741003 |Laterality|= 7771000 |Left|)");
-    p("28012007 |Closed fracture of shaft of tibia| : 272741003 |Laterality|= 7771000 |Left|"); //Close to user form omits restatement of finding site");
-    p("64572001 |Disease| : {363698007 |Finding site| = (52687003 |Bone structure of shaft of tibia| : 272741003 |Laterality|= 7771000 |Left|), 116676008 |Associated morphology| = 20946005 |Fracture, closed | }");
-    p("28012007 |Closed fracture of shaft of tibia| : 363698007 |Finding site| = 31156008 |Structure of left half of body|");
-  }
-
-  private void p(String expression) throws FHIRException {
-    Assert.assertNotNull("must be present", SnomedExpressions.parse(expression));
-    
-  }
-
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/StructureMapTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/StructureMapTests.java
deleted file mode 100644
index 6d80591dc0b..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/StructureMapTests.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.hl7.fhir.r4.context.SimpleWorkerContext;
-import org.hl7.fhir.r4.elementmodel.Element;
-import org.hl7.fhir.r4.elementmodel.Manager;
-import org.hl7.fhir.r4.elementmodel.Manager.FhirFormat;
-import org.hl7.fhir.r4.formats.IParser.OutputStyle;
-import org.hl7.fhir.r4.formats.XmlParser;
-import org.hl7.fhir.r4.model.Bundle;
-import org.hl7.fhir.r4.model.StructureDefinition;
-import org.hl7.fhir.r4.model.StructureMap;
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.r4.utils.StructureMapUtilities;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.utilities.TextFile;
-import org.hl7.fhir.utilities.Utilities;
-import org.junit.Test;
-
-
-public class StructureMapTests {
-
-  private void testParse(String path) throws FileNotFoundException, IOException, FHIRException {
-    if (TestingUtilities.context == null)
-    	TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-    
-    StructureMapUtilities scm = new StructureMapUtilities(TestingUtilities.context, null, null);
-    StructureMap map = scm.parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), path)));
-    TextFile.stringToFile(scm.render(map), Utilities.path(TestingUtilities.home(), path+".out"));
-  }
-  
-//  @Test
-//  public void testParseAny() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\any.map");
-//  }
-//
-//  @Test
-//  public void testParseBL() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\bl.map");
-//  }
-//
-//  @Test
-//  public void testParseED() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\ed.map");
-//  }
-//
-//  @Test
-//  public void testParseCD() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\cd.map");
-//  }
-//
-//  @Test
-//  public void testParseAD() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\ad.map");
-//  }
-//
-//  @Test
-//  public void testParsePQ() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\pq.map");
-//  }
-//
-//  @Test
-//  public void testParseIVLTS() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\ivl-ts.map");
-//  }
-//
-//  @Test
-//  public void testParseCDA() throws FHIRException, IOException {
-//    testParse("guides\\ccda2\\mapping\\map\\cda.map");
-//  }
-
-//  @Test
-//  public void testTransformCDA() throws FileNotFoundException, Exception {
-//    Map<String, StructureMap> maps = new HashMap<String, StructureMap>();
-//
-//    if (TestingUtilities.context == null)
-//    	TestingUtilities.context = SimpleWorkerContext.fromPack(Utilities.path(TestingUtilities.home(), "publish", "definitions.xml.zip"));
-//
-//    StructureMapUtilities scu = new StructureMapUtilities(TestingUtilities.context, maps, null);
-//    
-//    for (String f : new File(Utilities.path(TestingUtilities.home(), "guides", "ccda2", "mapping", "logical")).list()) {
-//      try {
-//        StructureDefinition sd = (StructureDefinition) new XmlParser().parse(new FileInputStream(Utilities.path(TestingUtilities.home(), "guides", "ccda2", "mapping", "logical", f)));
-//        ((SimpleWorkerContext) TestingUtilities.context).seeResource(sd.getUrl(), sd);
-//      } catch (Exception e) {
-//        e.printStackTrace();
-//      }
-//    }
-//   
-//    for (String f : new File(Utilities.path(TestingUtilities.home(), "guides", "ccda2", "mapping", "map")).list()) {
-//      try {
-//        StructureMap map = scu.parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "guides", "ccda2", "mapping", "map", f)));
-//        maps.put(map.getUrl(), map);
-//      } catch (Exception e) {
-//        e.printStackTrace();
-//      }
-//    }
-//        
-//    Element cda = Manager.parse(TestingUtilities.context, new FileInputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\example\\ccd.xml"), FhirFormat.XML);
-//    Manager.compose(TestingUtilities.context, cda, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\example\\ccd.out.json"), FhirFormat.JSON, OutputStyle.PRETTY, null);
-//    Manager.compose(TestingUtilities.context, cda, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\example\\ccd.out.xml"), FhirFormat.XML, OutputStyle.PRETTY, null);
-//    Bundle bundle = new Bundle();
-//    scu.transform(null, cda, maps.get("http://hl7.org/fhir/StructureMap/cda"), bundle);
-//    new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\bundle.xml"), bundle);
-//  }
-//
-//  @Test
-//  public void testTransformProfilesCDA() throws FileNotFoundException, Exception {
-//    Map<String, StructureMap> maps = new HashMap<String, StructureMap>();
-//
-//    if (TestingUtilities.context == null)
-//      TestingUtilities.context = SimpleWorkerContext.fromPack("C:\\work\\org.hl7.fhir\\build\\publish\\validation-min.xml.zip");
-//
-//    StructureMapUtilities scu = new StructureMapUtilities(TestingUtilities.context, maps, null);
-//    
-//    for (String f : new File("C:\\work\\org.hl7.fhir\\build\\guides\\ccda\\CDA").list()) {
-//      try {
-//        StructureDefinition sd = (StructureDefinition) new XmlParser().parse(new FileInputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda\\CDA\\"+f));
-//        ((SimpleWorkerContext) TestingUtilities.context).seeResource(sd.getUrl(), sd);
-//      } catch (Exception e) {
-//      }
-//    }
-//
-//    for (String f : new File("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\map").list()) {
-//      try {
-//        StructureMap map = scu.parse(TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\map\\"+ f));
-//        maps.put(map.getUrl(), map);
-//      } catch (Exception e) {
-//      }
-//    }
-//        
-//    List<StructureDefinition> result = scu.analyse(null, maps.get("http://hl7.org/fhir/StructureMap/cda")).getProfiles();
-//    for (StructureDefinition sd : result)
-//      new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\res-"+sd.getId()+".xml"), sd);
-//  }
-//
-}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/TurtleTests.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/TurtleTests.java
deleted file mode 100644
index 88b99ac074c..00000000000
--- a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/TurtleTests.java
+++ /dev/null
@@ -1,3552 +0,0 @@
-package org.hl7.fhir.r4.test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.hl7.fhir.r4.test.support.TestingUtilities;
-import org.hl7.fhir.r4.utils.formats.Turtle;
-import org.hl7.fhir.utilities.TextFile;
-import org.hl7.fhir.utilities.Utilities;
-import org.junit.Test;
-
-import junit.framework.Assert;
-
-public class TurtleTests {
-
-
-
-  private void doTest(String filename, boolean ok) throws Exception {
-    try {
-      String s = TextFile.fileToString(filename);
-      Turtle ttl = new Turtle();
-      ttl.parse(s);
-      Assert.assertTrue(ok);
-    } catch (Exception e) {
-      Assert.assertTrue(e.getMessage(), !ok);
-    }
-  }
-
-  @Test
-  public void test_double_lower_case_e1() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "double_lower_case_e.nt"), true);
-  }
-  @Test
-  public void test_double_lower_case_e2() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "double_lower_case_e.ttl"), true);
-  }
-  @Test
-  public void test_empty_collection1() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "empty_collection.nt"), true);
-  }
-  @Test
-  public void test_empty_collection2() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "empty_collection.ttl"), true);
-  }
-  @Test
-  public void test_first1() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "first.nt"), true);
-  }
-//  @Test
-//  public void test_first2() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "first.ttl"), true);
-//  }
-//  @Test
-  public void test_HYPHEN_MINUS_in_localNameNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "HYPHEN_MINUS_in_localName.nt"), true);
-  }
-  @Test
-  public void test_HYPHEN_MINUS_in_localName() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "HYPHEN_MINUS_in_localName.ttl"), true);
-  }
-  @Test
-  public void test_IRI_spoNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRI_spo.nt"), true);
-  }
-  @Test
-  public void test_IRI_subject() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRI_subject.ttl"), true);
-  }
-  @Test
-  public void test_IRI_with_all_punctuationNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRI_with_all_punctuation.nt"), true);
-  }
-  @Test
-  public void test_IRI_with_all_punctuation() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRI_with_all_punctuation.ttl"), true);
-  }
-  @Test
-  public void test_IRI_with_eight_digit_numeric_escape() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRI_with_eight_digit_numeric_escape.ttl"), true);
-  }
-  @Test
-  public void test_IRI_with_four_digit_numeric_escape() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRI_with_four_digit_numeric_escape.ttl"), true);
-  }
-  @Test
-  public void test_IRIREF_datatypeNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRIREF_datatype.nt"), true);
-  }
-  @Test
-  public void test_IRIREF_datatype() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "IRIREF_datatype.ttl"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_objectNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_object.nt"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_object() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_object.ttl"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_subjectNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_subject.nt"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_subject() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_subject.ttl"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_with_leading_digit() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_with_leading_digit.ttl"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_with_leading_underscore() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_with_leading_underscore.ttl"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_with_non_leading_extras() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_with_non_leading_extras.ttl"), true);
-  }
-  @Test
-  public void test_labeled_blank_node_with_PN_CHARS_BASE_character_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl"), false);
-  }
-  @Test
-  public void test_langtagged_LONG() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "langtagged_LONG.ttl"), true);
-  }
-  @Test
-  public void test_langtagged_LONG_with_subtagNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "langtagged_LONG_with_subtag.nt"), true);
-  }
-  @Test
-  public void test_langtagged_LONG_with_subtag() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "langtagged_LONG_with_subtag.ttl"), true);
-  }
-  @Test
-  public void test_langtagged_non_LONGNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "langtagged_non_LONG.nt"), true);
-  }
-  @Test
-  public void test_langtagged_non_LONG() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "langtagged_non_LONG.ttl"), true);
-  }
-  @Test
-  public void test_lantag_with_subtagNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "lantag_with_subtag.nt"), true);
-  }
-  @Test
-  public void test_lantag_with_subtag() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "lantag_with_subtag.ttl"), true);
-  }
-  @Test
-  public void test_lastNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "last.nt"), true);
-  }
-  @Test
-  public void test_last() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "last.ttl"), false);
-  }
-  @Test
-  public void test_literal_falseNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_false.nt"), true);
-  }
-  @Test
-  public void test_literal_false() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_false.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG1() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG1_ascii_boundariesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1_ascii_boundaries.nt"), false);
-  }
-  @Test
-  public void test_LITERAL_LONG1_ascii_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1_ascii_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG1_with_1_squoteNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1_with_1_squote.nt"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG1_with_1_squote() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1_with_1_squote.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG1_with_2_squotesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1_with_2_squotes.nt"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG1_with_2_squotes() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1_with_2_squotes.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG1_with_UTF8_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG1_with_UTF8_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG2() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG2_ascii_boundariesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_ascii_boundaries.nt"), false);
-  }
-  @Test
-  public void test_LITERAL_LONG2_ascii_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_ascii_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG2_with_1_squoteNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_with_1_squote.nt"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG2_with_1_squote() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_with_1_squote.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG2_with_2_squotesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_with_2_squotes.nt"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG2_with_2_squotes() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_with_2_squotes.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_LONG2_with_REVERSE_SOLIDUSNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_with_REVERSE_SOLIDUS.nt"), false);
-  }
-  @Test
-  public void test_LITERAL_LONG2_with_REVERSE_SOLIDUS() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl"), false);
-  }
-  @Test
-  public void test_LITERAL_LONG2_with_UTF8_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_LONG2_with_UTF8_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_literal_trueNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_true.nt"), true);
-  }
-  @Test
-  public void test_literal_true() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_true.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_BACKSPACENT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_BACKSPACE.nt"), false);
-  }
-  @Test
-  public void test_literal_with_BACKSPACE() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_BACKSPACE.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_CARRIAGE_RETURNNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_CARRIAGE_RETURN.nt"), true);
-  }
-  @Test
-  public void test_literal_with_CARRIAGE_RETURN() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_CARRIAGE_RETURN.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_CHARACTER_TABULATIONNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_CHARACTER_TABULATION.nt"), true);
-  }
-  @Test
-  public void test_literal_with_CHARACTER_TABULATION() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_CHARACTER_TABULATION.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_escaped_BACKSPACE() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_escaped_BACKSPACE.ttl"), false);
-  }
-  @Test
-  public void test_literal_with_escaped_CARRIAGE_RETURN() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_escaped_CARRIAGE_RETURN.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_escaped_CHARACTER_TABULATION() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_escaped_CHARACTER_TABULATION.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_escaped_FORM_FEED() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_escaped_FORM_FEED.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_escaped_LINE_FEED() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_escaped_LINE_FEED.ttl"), true);
-  }
-//  @Test
-//  public void test_literal_with_FORM_FEEDNT() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_FORM_FEED.nt"), true);
-//  }
-  @Test
-  public void test_literal_with_FORM_FEED() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_FORM_FEED.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_LINE_FEEDNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_LINE_FEED.nt"), true);
-  }
-  @Test
-  public void test_literal_with_LINE_FEED() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_LINE_FEED.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_numeric_escape4NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_numeric_escape4.nt"), true);
-  }
-  @Test
-  public void test_literal_with_numeric_escape4() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_numeric_escape4.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_numeric_escape8() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_numeric_escape8.ttl"), true);
-  }
-  @Test
-  public void test_literal_with_REVERSE_SOLIDUSNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_REVERSE_SOLIDUS.nt"), false);
-  }
-  @Test
-  public void test_literal_with_REVERSE_SOLIDUS() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "literal_with_REVERSE_SOLIDUS.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL_with_UTF8_boundariesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL_with_UTF8_boundaries.nt"), true);
-  }
-  @Test
-  public void test_LITERAL1NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1.nt"), true);
-  }
-  @Test
-  public void test_LITERAL1() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL1_all_controlsNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1_all_controls.nt"), false);
-  }
-  @Test
-  public void test_LITERAL1_all_controls() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1_all_controls.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL1_all_punctuationNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1_all_punctuation.nt"), true);
-  }
-  @Test
-  public void test_LITERAL1_all_punctuation() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1_all_punctuation.ttl"), true);
-  }
-//  @Test
-//  public void test_LITERAL1_ascii_boundariesNT() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1_ascii_boundaries.nt"), true);
-//  }
-  @Test
-  public void test_LITERAL1_ascii_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1_ascii_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL1_with_UTF8_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL1_with_UTF8_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL2() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL2.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL2_ascii_boundariesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL2_ascii_boundaries.nt"), false);
-  }
-  @Test
-  public void test_LITERAL2_ascii_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL2_ascii_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_LITERAL2_with_UTF8_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "LITERAL2_with_UTF8_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundariesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt"), true);
-  }
-  @Test
-  public void test_localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_localName_with_assigned_nfc_PN_CHARS_BASE_character_boundariesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt"), true);
-  }
-  @Test
-  public void test_localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl"), false);
-  }
-// don't need to support property names with ':'  
-//  @Test
-//  public void test_localname_with_COLONNT() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localname_with_COLON.nt"), true);
-//  }
-//  @Test
-//  public void test_localname_with_COLON() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localname_with_COLON.ttl"), true);
-//  }
-  @Test
-  public void test_localName_with_leading_digitNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_leading_digit.nt"), true);
-  }
-  @Test
-  public void test_localName_with_leading_digit() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_leading_digit.ttl"), true);
-  }
-  @Test
-  public void test_localName_with_leading_underscoreNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_leading_underscore.nt"), true);
-  }
-  @Test
-  public void test_localName_with_leading_underscore() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_leading_underscore.ttl"), true);
-  }
-  @Test
-  public void test_localName_with_nfc_PN_CHARS_BASE_character_boundariesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt"), true);
-  }
-  @Test
-  public void test_localName_with_nfc_PN_CHARS_BASE_character_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl"), false);
-  }
-  @Test
-  public void test_localName_with_non_leading_extrasNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_non_leading_extras.nt"), true);
-  }
-  @Test
-  public void test_localName_with_non_leading_extras() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "localName_with_non_leading_extras.ttl"), true);
-  }
-  @Test
-  public void test_negative_numericNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "negative_numeric.nt"), true);
-  }
-  @Test
-  public void test_negative_numeric() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "negative_numeric.ttl"), true);
-  }
-  @Test
-  public void test_nested_blankNodePropertyListsNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "nested_blankNodePropertyLists.nt"), true);
-  }
-  @Test
-  public void test_nested_blankNodePropertyLists() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "nested_blankNodePropertyLists.ttl"), true);
-  }
-  @Test
-  public void test_nested_collectionNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "nested_collection.nt"), true);
-  }
-  @Test
-  public void test_nested_collection() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "nested_collection.ttl"), false);
-  }
-  @Test
-  public void test_number_sign_following_localNameNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "number_sign_following_localName.nt"), true);
-  }
-  @Test
-  public void test_number_sign_following_localName() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "number_sign_following_localName.ttl"), true);
-  }
-  @Test
-  public void test_number_sign_following_PNAME_NSNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "number_sign_following_PNAME_NS.nt"), true);
-  }
-//  @Test
-//  public void test_number_sign_following_PNAME_NS() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "number_sign_following_PNAME_NS.ttl"), true);
-//  }
-  @Test
-  public void test_numeric_with_leading_0NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "numeric_with_leading_0.nt"), true);
-  }
-  @Test
-  public void test_numeric_with_leading_0() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "numeric_with_leading_0.ttl"), true);
-  }
-  @Test
-  public void test_objectList_with_two_objectsNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "objectList_with_two_objects.nt"), true);
-  }
-  @Test
-  public void test_objectList_with_two_objects() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "objectList_with_two_objects.ttl"), true);
-  }
-  @Test
-  public void test_old_style_base() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "old_style_base.ttl"), true);
-  }
-  @Test
-  public void test_old_style_prefix() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "old_style_prefix.ttl"), true);
-  }
-  @Test
-  public void test_percent_escaped_localNameNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "percent_escaped_localName.nt"), true);
-  }
-//  @Test
-//  public void test_percent_escaped_localName() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "percent_escaped_localName.ttl"), true);
-//  }
-  @Test
-  public void test_positive_numericNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "positive_numeric.nt"), true);
-  }
-  @Test
-  public void test_positive_numeric() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "positive_numeric.ttl"), true);
-  }
-  @Test
-  public void test_predicateObjectList_with_two_objectListsNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "predicateObjectList_with_two_objectLists.nt"), true);
-  }
-  @Test
-  public void test_predicateObjectList_with_two_objectLists() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "predicateObjectList_with_two_objectLists.ttl"), true);
-  }
-//  @Test
-//  public void test_prefix_only_IRI() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefix_only_IRI.ttl"), true);
-//  }
-  @Test
-  public void test_prefix_reassigned_and_usedNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefix_reassigned_and_used.nt"), true);
-  }
-  @Test
-  public void test_prefix_reassigned_and_used() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefix_reassigned_and_used.ttl"), true);
-  }
-  @Test
-  public void test_prefix_with_non_leading_extras() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefix_with_non_leading_extras.ttl"), true);
-  }
-  @Test
-  public void test_prefix_with_PN_CHARS_BASE_character_boundaries() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefix_with_PN_CHARS_BASE_character_boundaries.ttl"), true);
-  }
-  @Test
-  public void test_prefixed_IRI_object() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefixed_IRI_object.ttl"), true);
-  }
-  @Test
-  public void test_prefixed_IRI_predicate() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefixed_IRI_predicate.ttl"), true);
-  }
-  @Test
-  public void test_prefixed_name_datatype() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "prefixed_name_datatype.ttl"), true);
-  }
-  @Test
-  public void test_repeated_semis_at_end() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "repeated_semis_at_end.ttl"), true);
-  }
-  @Test
-  public void test_repeated_semis_not_at_endNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "repeated_semis_not_at_end.nt"), true);
-  }
-  @Test
-  public void test_repeated_semis_not_at_end() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "repeated_semis_not_at_end.ttl"), true);
-  }
-  @Test
-  public void test_reserved_escaped_localNameNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "reserved_escaped_localName.nt"), true);
-  }
-//  @Test
-//  public void test_reserved_escaped_localName() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "reserved_escaped_localName.ttl"), true);
-//  }
-  @Test
-  public void test_sole_blankNodePropertyList() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "sole_blankNodePropertyList.ttl"), true);
-  }
-  @Test
-  public void test_SPARQL_style_base() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "SPARQL_style_base.ttl"), true);
-  }
-  @Test
-  public void test_SPARQL_style_prefix() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "SPARQL_style_prefix.ttl"), true);
-  }
-  @Test
-  public void test_turtle_eval_bad_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-bad-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_eval_bad_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-bad-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_eval_bad_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-bad-03.ttl"), false);
-  }
-//  @Test
-//  public void test_turtle_eval_bad_04() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-bad-04.ttl"), false);
-//  }
-  @Test
-  public void test_turtle_eval_struct_01NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-struct-01.nt"), true);
-  }
-  @Test
-  public void test_turtle_eval_struct_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-struct-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_eval_struct_02NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-struct-02.nt"), true);
-  }
-  @Test
-  public void test_turtle_eval_struct_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-eval-struct-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_01NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-01.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_02NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-02.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_03NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-03.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_subm_04NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-04.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-04.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_05NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-05.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-05.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_06NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-06.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_06() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-06.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_07NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-07.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-07.ttl"), false);
-  }
-  @Test
-  public void test_NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-08.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_08() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-08.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_09NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-09.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_09() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-09.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_10NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-10.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_10() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-10.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_11NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-11.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_11() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-11.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_12NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-12.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_12() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-12.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_13NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-13.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_13() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-13.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_14NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-14.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_14() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-14.ttl"), false);
-  }
-  @Test
-  public void test_turtle_subm_15NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-15.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_15() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-15.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_16NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-16.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_16() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-16.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_17NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-17.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_17() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-17.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_18NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-18.nt"), false);
-  }
-  @Test
-  public void test_turtle_subm_18() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-18.ttl"), false);
-  }
-  @Test
-  public void test_turtle_subm_19NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-19.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_19() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-19.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_20NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-20.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_20() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-20.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_21NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-21.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_21() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-21.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_22NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-22.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_22() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-22.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_23NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-23.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_23() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-23.ttl"), false);
-  }
-  @Test
-  public void test_turtle_subm_24NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-24.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_24() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-24.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_25NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-25.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_25() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-25.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_26NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-26.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_26() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-26.ttl"), true);
-  }
-  @Test
-  public void test_turtle_subm_27NT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-27.nt"), true);
-  }
-  @Test
-  public void test_turtle_subm_27() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-subm-27.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_base_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-base-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_base_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-base-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_base_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-base-03.ttl"), false);
-  }
-//  @Test
-//  public void test_turtle_syntax_bad_blank_label_dot_end() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-blank-label-dot-end.ttl"), false);
-//  }
-  @Test
-  public void test_turtle_syntax_bad_esc_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-esc-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_esc_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-esc-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_esc_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-esc-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_esc_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-esc-04.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_kw_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-kw-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_kw_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-kw-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_kw_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-kw-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_kw_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-kw-04.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_kw_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-kw-05.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_lang_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-lang-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_LITERAL2_with_langtag_and_datatype() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_ln_dash_start() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-ln-dash-start.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bad_ln_escape() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-ln-escape.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_ln_escape_start() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-ln-escape-start.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_missing_ns_dot_end() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-missing-ns-dot-end.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_missing_ns_dot_start() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-missing-ns-dot-start.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-04.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-05.ttl"), false);
-  }
-//  @Test
-//  public void test_turtle_syntax_bad_n3_extras_06() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-06.ttl"), false);
-//  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-07.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_08() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-08.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_09() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-09.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_10() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-10.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_11() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-11.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_12() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-12.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_n3_extras_13() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-n3-extras-13.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_ns_dot_end() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-ns-dot-end.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bad_ns_dot_start() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-ns-dot-start.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_num_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-num-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_num_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-num-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_num_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-num-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_num_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-num-04.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_num_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-num-05.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_number_dot_in_anon() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-number-dot-in-anon.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bad_pname_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-pname-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_pname_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-pname-02.ttl"), false);
-  }
-//  @Test
-//  public void test_turtle_syntax_bad_pname_03() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-pname-03.ttl"), false);
-//  }
-  @Test
-  public void test_turtle_syntax_bad_prefix_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-prefix-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_prefix_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-prefix-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_prefix_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-prefix-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_prefix_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-prefix-04.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_prefix_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-prefix-05.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_string_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-string-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_string_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-string-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_string_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-string-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_string_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-string-04.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_string_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-string-05.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_string_06() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-string-06.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_string_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-string-07.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-04.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-05.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_06() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-06.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-07.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_08() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-08.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_09() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-09.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_10() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-10.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_11() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-11.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_12() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-12.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_13() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-13.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_14() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-14.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_15() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-15.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_16() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-16.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_struct_17() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-struct-17.ttl"), true);
-  }
-//  @Test
-//  public void test_turtle_syntax_bad_uri_01() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-uri-01.ttl"), false);
-//  }
-  @Test
-  public void test_turtle_syntax_bad_uri_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-uri-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_bad_uri_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-uri-03.ttl"), false);
-  }
-//  @Test
-//  public void test_turtle_syntax_bad_uri_04() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-uri-04.ttl"), false);
-//  }
-//  @Test
-//  public void test_turtle_syntax_bad_uri_05() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bad-uri-05.ttl"), false);
-//  }
-  @Test
-  public void test_turtle_syntax_base_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-base-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_base_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-base-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_base_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-base-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_base_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-base-04.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_blank_label() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-blank-label.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-04.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-05.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_06() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-06.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-07.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_08() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-08.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_09() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-09.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_bnode_10() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-bnode-10.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_datatypes_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-datatypes-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_datatypes_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-datatypes-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_file_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-file-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_file_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-file-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_file_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-file-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_kw_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-kw-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_kw_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-kw-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_kw_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-kw-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_lists_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-lists-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_lists_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-lists-02.ttl"), true);
-  }
-//  @Test
-//  public void test_turtle_syntax_lists_03() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-lists-03.ttl"), true);
-//  }
-//  @Test
-//  public void test_turtle_syntax_lists_04() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-lists-04.ttl"), true);
-//  }
-//  @Test
-//  public void test_turtle_syntax_lists_05() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-lists-05.ttl"), true);
-//  }
-//  @Test
-//  public void test_turtle_syntax_ln_colons() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-ln-colons.ttl"), true);
-//  }
-  @Test
-  public void test_turtle_syntax_ln_dots() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-ln-dots.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_ns_dots() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-ns-dots.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_number_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_number_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_number_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_number_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-04.ttl"), true);
-  }
-//  @Test
-//  public void test_turtle_syntax_number_05() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-05.ttl"), true);
-//  }
-  @Test
-  public void test_turtle_syntax_number_06() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-06.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_number_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-07.ttl"), true);
-  }
-//  @Test
-//  public void test_turtle_syntax_number_08() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-08.ttl"), true);
-//  }
-  @Test
-  public void test_turtle_syntax_number_09() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-09.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_number_10() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-10.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_number_11() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-number-11.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_pname_esc_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-pname-esc-01.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_pname_esc_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-pname-esc-02.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_pname_esc_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-pname-esc-03.ttl"), false);
-  }
-  @Test
-  public void test_turtle_syntax_prefix_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-01.ttl"), true);
-  }
-//  @Test
-//  public void test_turtle_syntax_prefix_02() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-02.ttl"), true);
-//  }
-  @Test
-  public void test_turtle_syntax_prefix_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_prefix_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-04.ttl"), true);
-  }
-//  @Test
-//  public void test_turtle_syntax_prefix_05() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-05.ttl"), true);
-//  }
-//  @Test
-//  public void test_turtle_syntax_prefix_06() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-06.ttl"), true);
-//  }
-  @Test
-  public void test_turtle_syntax_prefix_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-07.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_prefix_08() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-08.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_prefix_09() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-prefix-09.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_str_esc_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-str-esc-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_str_esc_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-str-esc-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_str_esc_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-str-esc-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-04.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-05.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_06() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-06.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_07() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-07.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_08() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-08.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_09() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-09.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_10() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-10.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_string_11() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-string-11.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_struct_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-struct-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_struct_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-struct-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_struct_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-struct-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_struct_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-struct-04.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_struct_05() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-struct-05.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_uri_01() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-uri-01.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_uri_02() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-uri-02.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_uri_03() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-uri-03.ttl"), true);
-  }
-  @Test
-  public void test_turtle_syntax_uri_04() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "turtle-syntax-uri-04.ttl"), true);
-  }
-  @Test
-  public void test_two_LITERAL_LONG2sNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "two_LITERAL_LONG2s.nt"), true);
-  }
-  @Test
-  public void test_two_LITERAL_LONG2s() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "two_LITERAL_LONG2s.ttl"), true);
-  }
-  @Test
-  public void test_underscore_in_localNameNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "underscore_in_localName.nt"), true);
-  }
-  @Test
-  public void test_underscore_in_localName() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "underscore_in_localName.ttl"), true);
-  }
-  @Test
-  public void test_anonymous_blank_node_object() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "anonymous_blank_node_object.ttl"), true);
-  }
-  @Test
-  public void test_anonymous_blank_node_subject() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "anonymous_blank_node_subject.ttl"), true);
-  }
-  @Test
-  public void test_bareword_a_predicateNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "bareword_a_predicate.nt"), true);
-  }
-  @Test
-  public void test_bareword_a_predicate() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "bareword_a_predicate.ttl"), true);
-  }
-  @Test
-  public void test_bareword_decimalNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "bareword_decimal.nt"), true);
-  }
-  @Test
-  public void test_bareword_decimal() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "bareword_decimal.ttl"), true);
-  }
-  @Test
-  public void test_bareword_doubleNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "bareword_double.nt"), true);
-  }
-  @Test
-  public void test_bareword_double() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "bareword_double.ttl"), true);
-  }
-  @Test
-  public void test_bareword_integer() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "bareword_integer.ttl"), true);
-  }
-  @Test
-  public void test_blankNodePropertyList_as_objectNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_as_object.nt"), true);
-  }
-  @Test
-  public void test_blankNodePropertyList_as_object() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_as_object.ttl"), true);
-  }
-  @Test
-  public void test_blankNodePropertyList_as_subjectNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_as_subject.nt"), true);
-  }
-//  @Test
-//  public void test_blankNodePropertyList_as_subject() throws Exception {
-//    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_as_subject.ttl"), true);
-//  }
-  
-  @Test
-  public void test_blankNodePropertyList_containing_collectionNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_containing_collection.nt"), true);
-  }
-  @Test
-  public void test_blankNodePropertyList_containing_collection() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_containing_collection.ttl"), true);
-  }
-  @Test
-  public void test_blankNodePropertyList_with_multiple_triplesNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_with_multiple_triples.nt"), true);
-  }
-  @Test
-  public void test_blankNodePropertyList_with_multiple_triples() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "blankNodePropertyList_with_multiple_triples.ttl"), true);
-  }
-  @Test
-  public void test_collection_objectNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "collection_object.nt"), true);
-  }
-  @Test
-  public void test_collection_object() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "collection_object.ttl"), true);
-  }
-  @Test
-  public void test_collection_subjectNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "collection_subject.nt"), true);
-  }
-  @Test
-  public void test_collection_subject() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "collection_subject.ttl"), false);
-  }
-  @Test
-  public void test_comment_following_localName() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "comment_following_localName.ttl"), true);
-  }
-  @Test
-  public void test_comment_following_PNAME_NSNT() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "comment_following_PNAME_NS.nt"), true);
-  }
-  @Test
-  public void test_comment_following_PNAME_NS() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "comment_following_PNAME_NS.ttl"), false);
-  }
-  @Test
-  public void test__default_namespace_IRI() throws Exception {
-    doTest(Utilities.path(TestingUtilities.home(), "tests", "turtle", "default_namespace_IRI.ttl"), true);
-  }
-//
-
-  @Test
-  public void test_audit_event_example_pixQuery() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("audit-event-example-pixQuery.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "audit-event-example-pixQuery.ttl")));
-  }
-  @Test
-  public void test_audit_event_example_media() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("audit-event-example-media.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "audit-event-example-media.ttl")));
-  }
-  @Test
-  public void test_audit_event_example_logout() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("audit-event-example-logout.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "audit-event-example-logout.ttl")));
-  }
-  @Test
-  public void test_audit_event_example_login() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("audit-event-example-login.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "audit-event-example-login.ttl")));
-  }
-  @Test
-  public void test_appointmentresponse_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("appointmentresponse-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "appointmentresponse-example.ttl")));
-  }
-  @Test
-  public void test_appointmentresponse_example_req() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("appointmentresponse-example-req.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "appointmentresponse-example-req.ttl")));
-  }
-  @Test
-  public void test_appointment_example2doctors() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("appointment-example2doctors.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "appointment-example2doctors.ttl")));
-  }
-  @Test
-  public void test_appointment_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("appointment-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "appointment-example.ttl")));
-  }
-  @Test
-  public void test_appointment_example_request() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("appointment-example-request.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "appointment-example-request.ttl")));
-  }
-  @Test
-  public void test_allergyintolerance_medication() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("allergyintolerance-medication.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "allergyintolerance-medication.ttl")));
-  }
-  @Test
-  public void test_allergyintolerance_fishallergy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("allergyintolerance-fishallergy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "allergyintolerance-fishallergy.ttl")));
-  }
-  @Test
-  public void test_allergyintolerance_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("allergyintolerance-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "allergyintolerance-example.ttl")));
-  }
-  @Test
-  public void test_account_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("account-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "account-example.ttl")));
-  }
-  @Test
-  public void test_xds_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("xds-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "xds-example.ttl")));
-  }
-  @Test
-  public void test_visionprescription_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("visionprescription-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "visionprescription-example.ttl")));
-  }
-  @Test
-  public void test_visionprescription_example_1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("visionprescription-example-1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "visionprescription-example-1.ttl")));
-  }
-  @Test
-  public void test_valueset_ucum_common() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("valueset-ucum-common.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "valueset-ucum-common.ttl")));
-  }
-  @Test
-  public void test_valueset_nhin_purposeofuse() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("valueset-nhin-purposeofuse.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "valueset-nhin-purposeofuse.ttl")));
-  }
-  @Test
-  public void test_valueset_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("valueset-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "valueset-example.ttl")));
-  }
-  @Test
-  public void test_valueset_example_yesnodontknow() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("valueset-example-yesnodontknow.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "valueset-example-yesnodontknow.ttl")));
-  }
-  @Test
-  public void test_valueset_example_intensional() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("valueset-example-intensional.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "valueset-example-intensional.ttl")));
-  }
-  @Test
-  public void test_valueset_example_expansion() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("valueset-example-expansion.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "valueset-example-expansion.ttl")));
-  }
-  @Test
-  public void test_valueset_cpt_all() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("valueset-cpt-all.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "valueset-cpt-all.ttl")));
-  }
-  @Test
-  public void test_testscript_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("testscript-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "testscript-example.ttl")));
-  }
-  @Test
-  public void test_testscript_example_rule() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("testscript-example-rule.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "testscript-example-rule.ttl")));
-  }
-  @Test
-  public void test_supplydelivery_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("supplydelivery-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "supplydelivery-example.ttl")));
-  }
-  @Test
-  public void test_substance_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("substance-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "substance-example.ttl")));
-  }
-  @Test
-  public void test_substance_example_silver_nitrate_product() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("substance-example-silver-nitrate-product.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "substance-example-silver-nitrate-product.ttl")));
-  }
-  @Test
-  public void test_substance_example_f203_potassium() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("substance-example-f203-potassium.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "substance-example-f203-potassium.ttl")));
-  }
-  @Test
-  public void test_substance_example_f202_staphylococcus() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("substance-example-f202-staphylococcus.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "substance-example-f202-staphylococcus.ttl")));
-  }
-  @Test
-  public void test_substance_example_f201_dust() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("substance-example-f201-dust.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "substance-example-f201-dust.ttl")));
-  }
-  @Test
-  public void test_substance_example_amoxicillin_clavulanate() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("substance-example-amoxicillin-clavulanate.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "substance-example-amoxicillin-clavulanate.ttl")));
-  }
-  @Test
-  public void test_subscription_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("subscription-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "subscription-example.ttl")));
-  }
-  @Test
-  public void test_subscription_example_error() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("subscription-example-error.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "subscription-example-error.ttl")));
-  }
-  @Test
-  public void test_structuremap_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("structuremap-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "structuremap-example.ttl")));
-  }
-  @Test
-  public void test_structuredefinition_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("structuredefinition-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "structuredefinition-example.ttl")));
-  }
-  @Test
-  public void test_specimen_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("specimen-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "specimen-example.ttl")));
-  }
-  @Test
-  public void test_specimen_example_urine() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("specimen-example-urine.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "specimen-example-urine.ttl")));
-  }
-  @Test
-  public void test_specimen_example_isolate() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("specimen-example-isolate.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "specimen-example-isolate.ttl")));
-  }
-  @Test
-  public void test_slot_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("slot-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "slot-example.ttl")));
-  }
-  @Test
-  public void test_slot_example_unavailable() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("slot-example-unavailable.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "slot-example-unavailable.ttl")));
-  }
-  @Test
-  public void test_slot_example_tentative() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("slot-example-tentative.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "slot-example-tentative.ttl")));
-  }
-  @Test
-  public void test_slot_example_busy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("slot-example-busy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "slot-example-busy.ttl")));
-  }
-  @Test
-  public void test_sequence_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("sequence-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "sequence-example.ttl")));
-  }
-  @Test
-  public void test_searchparameter_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("searchparameter-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "searchparameter-example.ttl")));
-  }
-  @Test
-  public void test_searchparameter_example_extension() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("searchparameter-example-extension.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "searchparameter-example-extension.ttl")));
-  }
-  @Test
-  public void test_schedule_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("schedule-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "schedule-example.ttl")));
-  }
-  @Test
-  public void test_riskassessment_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("riskassessment-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "riskassessment-example.ttl")));
-  }
-  @Test
-  public void test_riskassessment_example_prognosis() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("riskassessment-example-prognosis.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "riskassessment-example-prognosis.ttl")));
-  }
-  @Test
-  public void test_riskassessment_example_population() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("riskassessment-example-population.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "riskassessment-example-population.ttl")));
-  }
-  @Test
-  public void test_riskassessment_example_cardiac() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("riskassessment-example-cardiac.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "riskassessment-example-cardiac.ttl")));
-  }
-  @Test
-  public void test_relatedperson_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("relatedperson-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "relatedperson-example.ttl")));
-  }
-  @Test
-  public void test_relatedperson_example_peter() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("relatedperson-example-peter.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "relatedperson-example-peter.ttl")));
-  }
-  @Test
-  public void test_relatedperson_example_f002_ariadne() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("relatedperson-example-f002-ariadne.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "relatedperson-example-f002-ariadne.ttl")));
-  }
-  @Test
-  public void test_relatedperson_example_f001_sarah() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("relatedperson-example-f001-sarah.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "relatedperson-example-f001-sarah.ttl")));
-  }
-  @Test
-  public void test_provenance_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("provenance-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "provenance-example.ttl")));
-  }
-  @Test
-  public void test_provenance_example_sig() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("provenance-example-sig.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "provenance-example-sig.ttl")));
-  }
-  @Test
-  public void test_processresponse_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processresponse-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processresponse-example.ttl")));
-  }
-  @Test
-  public void test_processrequest_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_status() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-status.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-status.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_reverse() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-reverse.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-reverse.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_reprocess() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-reprocess.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-reprocess.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_poll_specific() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-poll-specific.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-poll-specific.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_poll_payrec() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-poll-payrec.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-poll-payrec.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_poll_inclusive() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-poll-inclusive.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-poll-inclusive.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_poll_exclusive() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-poll-exclusive.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-poll-exclusive.ttl")));
-  }
-  @Test
-  public void test_processrequest_example_poll_eob() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("processrequest-example-poll-eob.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "processrequest-example-poll-eob.ttl")));
-  }
-  @Test
-  public void test_procedurerequest_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedurerequest-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedurerequest-example.ttl")));
-  }
-  @Test
-  public void test_procedure_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example.ttl")));
-  }
-  @Test
-  public void test_procedure_example_implant() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example-implant.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example-implant.ttl")));
-  }
-  @Test
-  public void test_procedure_example_f201_tpf() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example-f201-tpf.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example-f201-tpf.ttl")));
-  }
-  @Test
-  public void test_procedure_example_f004_tracheotomy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example-f004-tracheotomy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example-f004-tracheotomy.ttl")));
-  }
-  @Test
-  public void test_procedure_example_f003_abscess() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example-f003-abscess.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example-f003-abscess.ttl")));
-  }
-  @Test
-  public void test_procedure_example_f002_lung() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example-f002-lung.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example-f002-lung.ttl")));
-  }
-  @Test
-  public void test_procedure_example_f001_heart() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example-f001-heart.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example-f001-heart.ttl")));
-  }
-  @Test
-  public void test_procedure_example_biopsy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("procedure-example-biopsy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "procedure-example-biopsy.ttl")));
-  }
-  @Test
-  public void test_practitionerrole_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitionerrole-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitionerrole-example.ttl")));
-  }
-  @Test
-  public void test_practitioner_examples_general() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-examples-general.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-examples-general.ttl")));
-  }
-  @Test
-  public void test_practitioner_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_xcda1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-xcda1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-xcda1.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_xcda_author() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-xcda-author.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-xcda-author.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f204_ce() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f204-ce.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f204-ce.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f203_jvg() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f203-jvg.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f203-jvg.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f202_lm() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f202-lm.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f202-lm.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f201_ab() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f201-ab.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f201-ab.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f007_sh() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f007-sh.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f007-sh.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f006_rvdb() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f006-rvdb.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f006-rvdb.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f005_al() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f005-al.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f005-al.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f004_rb() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f004-rb.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f004-rb.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f003_mv() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f003-mv.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f003-mv.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f002_pv() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f002-pv.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f002-pv.ttl")));
-  }
-  @Test
-  public void test_practitioner_example_f001_evdb() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("practitioner-example-f001-evdb.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "practitioner-example-f001-evdb.ttl")));
-  }
-  @Test
-  public void test_person_provider_directory() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("person-provider-directory.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "person-provider-directory.ttl")));
-  }
-  @Test
-  public void test_person_patient_portal() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("person-patient-portal.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "person-patient-portal.ttl")));
-  }
-  @Test
-  public void test_person_grahame() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("person-grahame.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "person-grahame.ttl")));
-  }
-  @Test
-  public void test_person_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("person-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "person-example.ttl")));
-  }
-  @Test
-  public void test_person_example_f002_ariadne() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("person-example-f002-ariadne.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "person-example-f002-ariadne.ttl")));
-  }
-  @Test
-  public void test_paymentreconciliation_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("paymentreconciliation-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "paymentreconciliation-example.ttl")));
-  }
-  @Test
-  public void test_paymentnotice_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("paymentnotice-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "paymentnotice-example.ttl")));
-  }
-  @Test
-  public void test_patient_glossy_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-glossy-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-glossy-example.ttl")));
-  }
-  @Test
-  public void test_patient_examples_general() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-examples-general.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-examples-general.ttl")));
-  }
-  @Test
-  public void test_patient_examples_cypress_template() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-examples-cypress-template.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-examples-cypress-template.ttl")));
-  }
-  @Test
-  public void test_patient_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example.ttl")));
-  }
-  @Test
-  public void test_patient_example_xds() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-xds.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-xds.ttl")));
-  }
-  @Test
-  public void test_patient_example_xcda() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-xcda.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-xcda.ttl")));
-  }
-  @Test
-  public void test_patient_example_proband() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-proband.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-proband.ttl")));
-  }
-  @Test
-  public void test_patient_example_ihe_pcd() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-ihe-pcd.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-ihe-pcd.ttl")));
-  }
-  @Test
-  public void test_patient_example_f201_roel() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-f201-roel.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-f201-roel.ttl")));
-  }
-  @Test
-  public void test_patient_example_f001_pieter() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-f001-pieter.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-f001-pieter.ttl")));
-  }
-  @Test
-  public void test_patient_example_dicom() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-dicom.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-dicom.ttl")));
-  }
-  @Test
-  public void test_patient_example_d() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-d.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-d.ttl")));
-  }
-  @Test
-  public void test_patient_example_c() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-c.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-c.ttl")));
-  }
-  @Test
-  public void test_patient_example_b() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-b.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-b.ttl")));
-  }
-  @Test
-  public void test_patient_example_animal() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-animal.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-animal.ttl")));
-  }
-  @Test
-  public void test_patient_example_a() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("patient-example-a.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "patient-example-a.ttl")));
-  }
-  @Test
-  public void test_parameters_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("parameters-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "parameters-example.ttl")));
-  }
-  @Test
-  public void test_organization_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example.ttl")));
-  }
-  @Test
-  public void test_organization_example_lab() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-lab.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-lab.ttl")));
-  }
-  @Test
-  public void test_organization_example_insurer() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-insurer.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-insurer.ttl")));
-  }
-  @Test
-  public void test_organization_example_good_health_care() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-good-health-care.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-good-health-care.ttl")));
-  }
-  @Test
-  public void test_organization_example_gastro() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-gastro.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-gastro.ttl")));
-  }
-  @Test
-  public void test_organization_example_f203_bumc() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-f203-bumc.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-f203-bumc.ttl")));
-  }
-  @Test
-  public void test_organization_example_f201_aumc() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-f201-aumc.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-f201-aumc.ttl")));
-  }
-  @Test
-  public void test_organization_example_f003_burgers_ENT() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-f003-burgers-ENT.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-f003-burgers-ENT.ttl")));
-  }
-  @Test
-  public void test_organization_example_f002_burgers_card() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-f002-burgers-card.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-f002-burgers-card.ttl")));
-  }
-  @Test
-  public void test_organization_example_f001_burgers() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("organization-example-f001-burgers.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "organization-example-f001-burgers.ttl")));
-  }
-  @Test
-  public void test_operationoutcome_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("operationoutcome-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "operationoutcome-example.ttl")));
-  }
-  @Test
-  public void test_operationoutcome_example_validationfail() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("operationoutcome-example-validationfail.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "operationoutcome-example-validationfail.ttl")));
-  }
-  @Test
-  public void test_operationoutcome_example_searchfail() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("operationoutcome-example-searchfail.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "operationoutcome-example-searchfail.ttl")));
-  }
-  @Test
-  public void test_operationoutcome_example_exception() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("operationoutcome-example-exception.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "operationoutcome-example-exception.ttl")));
-  }
-  @Test
-  public void test_operationoutcome_example_break_the_glass() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("operationoutcome-example-break-the-glass.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "operationoutcome-example-break-the-glass.ttl")));
-  }
-  @Test
-  public void test_operationoutcome_example_allok() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("operationoutcome-example-allok.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "operationoutcome-example-allok.ttl")));
-  }
-  @Test
-  public void test_operationdefinition_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("operationdefinition-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "operationdefinition-example.ttl")));
-  }
-  @Test
-  public void test_observation_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example.ttl")));
-  }
-  @Test
-  public void test_observation_example_unsat() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-unsat.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-unsat.ttl")));
-  }
-  @Test
-  public void test_observation_example_satO2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-satO2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-satO2.ttl")));
-  }
-  @Test
-  public void test_observation_example_sample_data() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-sample-data.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-sample-data.ttl")));
-  }
-  @Test
-  public void test_observation_example_glasgow() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-glasgow.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-glasgow.ttl")));
-  }
-  @Test
-  public void test_observation_example_glasgow_qa() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-glasgow-qa.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-glasgow-qa.ttl")));
-  }
-  @Test
-  public void test_observation_example_genetics_5() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-genetics-5.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-genetics-5.ttl")));
-  }
-  @Test
-  public void test_observation_example_genetics_4() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-genetics-4.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-genetics-4.ttl")));
-  }
-  @Test
-  public void test_observation_example_genetics_3() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-genetics-3.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-genetics-3.ttl")));
-  }
-  @Test
-  public void test_observation_example_genetics_2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-genetics-2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-genetics-2.ttl")));
-  }
-  @Test
-  public void test_observation_example_genetics_1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-genetics-1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-genetics-1.ttl")));
-  }
-  @Test
-  public void test_observation_example_f206_staphylococcus() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f206-staphylococcus.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f206-staphylococcus.ttl")));
-  }
-  @Test
-  public void test_observation_example_f205_egfr() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f205-egfr.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f205-egfr.ttl")));
-  }
-  @Test
-  public void test_observation_example_f204_creatinine() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f204-creatinine.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f204-creatinine.ttl")));
-  }
-  @Test
-  public void test_observation_example_f203_bicarbonate() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f203-bicarbonate.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f203-bicarbonate.ttl")));
-  }
-  @Test
-  public void test_observation_example_f202_temperature() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f202-temperature.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f202-temperature.ttl")));
-  }
-  @Test
-  public void test_observation_example_f005_hemoglobin() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f005-hemoglobin.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f005-hemoglobin.ttl")));
-  }
-  @Test
-  public void test_observation_example_f004_erythrocyte() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f004-erythrocyte.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f004-erythrocyte.ttl")));
-  }
-  @Test
-  public void test_observation_example_f003_co2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f003-co2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f003-co2.ttl")));
-  }
-  @Test
-  public void test_observation_example_f002_excess() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f002-excess.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f002-excess.ttl")));
-  }
-  @Test
-  public void test_observation_example_f001_glucose() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-f001-glucose.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-f001-glucose.ttl")));
-  }
-  @Test
-  public void test_observation_example_bloodpressure() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-bloodpressure.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-bloodpressure.ttl")));
-  }
-  @Test
-  public void test_observation_example_bloodpressure_cancel() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("observation-example-bloodpressure-cancel.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "observation-example-bloodpressure-cancel.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_texture_modified() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-texture-modified.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-texture-modified.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_renaldiet() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-renaldiet.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-renaldiet.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_pureeddiet() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-pureeddiet.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-pureeddiet.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_pureeddiet_simple() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-pureeddiet-simple.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-pureeddiet-simple.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_proteinsupplement() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-proteinsupplement.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-proteinsupplement.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_infantenteral() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-infantenteral.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-infantenteral.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_fiberrestricteddiet() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-fiberrestricteddiet.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-fiberrestricteddiet.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_enteralcontinuous() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-enteralcontinuous.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-enteralcontinuous.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_enteralbolus() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-enteralbolus.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-enteralbolus.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_energysupplement() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-energysupplement.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-energysupplement.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_diabeticsupplement() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-diabeticsupplement.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-diabeticsupplement.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_diabeticdiet() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-diabeticdiet.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-diabeticdiet.ttl")));
-  }
-  @Test
-  public void test_nutritionorder_example_cardiacdiet() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("nutritionorder-example-cardiacdiet.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "nutritionorder-example-cardiacdiet.ttl")));
-  }
-  @Test
-  public void test_namingsystem_registry() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("namingsystem-registry.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "namingsystem-registry.ttl")));
-  }
-  @Test
-  public void test_namingsystem_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("namingsystem-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "namingsystem-example.ttl")));
-  }
-  @Test
-  public void test_namingsystem_example_replaced() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("namingsystem-example-replaced.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "namingsystem-example-replaced.ttl")));
-  }
-  @Test
-  public void test_namingsystem_example_id() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("namingsystem-example-id.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "namingsystem-example-id.ttl")));
-  }
-  @Test
-  public void test_messageheader_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("messageheader-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "messageheader-example.ttl")));
-  }
-  @Test
-  public void test_message_response_link() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("message-response-link.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "message-response-link.ttl")));
-  }
-  @Test
-  public void test_message_request_link() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("message-request-link.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "message-request-link.ttl")));
-  }
-  @Test
-  public void test_medicationstatementexample7() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationstatementexample7.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationstatementexample7.ttl")));
-  }
-  @Test
-  public void test_medicationstatementexample6() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationstatementexample6.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationstatementexample6.ttl")));
-  }
-  @Test
-  public void test_medicationstatementexample5() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationstatementexample5.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationstatementexample5.ttl")));
-  }
-  @Test
-  public void test_medicationstatementexample4() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationstatementexample4.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationstatementexample4.ttl")));
-  }
-  @Test
-  public void test_medicationstatementexample2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationstatementexample2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationstatementexample2.ttl")));
-  }
-  @Test
-  public void test_medicationstatementexample1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationstatementexample1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationstatementexample1.ttl")));
-  }
-  @Test
-  public void test_medicationrequestexample2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationrequestexample2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationrequestexample2.ttl")));
-  }
-  @Test
-  public void test_medicationrequestexample1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationrequestexample1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationrequestexample1.ttl")));
-  }
-  @Test
-  public void test_medicationexample15() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationexample15.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationexample15.ttl")));
-  }
-  @Test
-  public void test_medicationexample1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationexample1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationexample1.ttl")));
-  }
-  @Test
-  public void test_medicationdispenseexample8() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationdispenseexample8.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationdispenseexample8.ttl")));
-  }
-  @Test
-  public void test_medicationadministrationexample3() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationadministrationexample3.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationadministrationexample3.ttl")));
-  }
-  @Test
-  public void test_medication_example_f203_paracetamol() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("medicationexample0312.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "medicationexample0312.ttl")));
-  }
-  @Test
-  public void test_media_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("media-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "media-example.ttl")));
-  }
-  @Test
-  public void test_media_example_sound() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("media-example-sound.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "media-example-sound.ttl")));
-  }
-  @Test
-  public void test_media_example_dicom() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("media-example-dicom.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "media-example-dicom.ttl")));
-  }
-  @Test
-  public void test_measurereport_cms146_cat3_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("measurereport-cms146-cat3-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "measurereport-cms146-cat3-example.ttl")));
-  }
-  @Test
-  public void test_measurereport_cms146_cat2_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("measurereport-cms146-cat2-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "measurereport-cms146-cat2-example.ttl")));
-  }
-  @Test
-  public void test_measurereport_cms146_cat1_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("measurereport-cms146-cat1-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "measurereport-cms146-cat1-example.ttl")));
-  }
-  @Test
-  public void test_measure_exclusive_breastfeeding() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("measure-exclusive-breastfeeding.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "measure-exclusive-breastfeeding.ttl")));
-  }
-  @Test
-  public void test_location_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("location-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "location-example.ttl")));
-  }
-  @Test
-  public void test_location_example_ukpharmacy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("location-example-ukpharmacy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "location-example-ukpharmacy.ttl")));
-  }
-  @Test
-  public void test_location_example_room() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("location-example-room.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "location-example-room.ttl")));
-  }
-  @Test
-  public void test_location_example_patients_home() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("location-example-patients-home.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "location-example-patients-home.ttl")));
-  }
-  @Test
-  public void test_location_example_hl7hq() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("location-example-hl7hq.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "location-example-hl7hq.ttl")));
-  }
-  @Test
-  public void test_location_example_ambulance() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("location-example-ambulance.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "location-example-ambulance.ttl")));
-  }
-  @Test
-  public void test_list_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("list-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "list-example.ttl")));
-  }
-  @Test
-  public void test_list_example_medlist() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("list-example-medlist.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "list-example-medlist.ttl")));
-  }
-  @Test
-  public void test_list_example_familyhistory_f201_roel() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("list-example-familyhistory-f201-roel.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "list-example-familyhistory-f201-roel.ttl")));
-  }
-  @Test
-  public void test_list_example_empty() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("list-example-empty.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "list-example-empty.ttl")));
-  }
-  @Test
-  public void test_list_example_allergies() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("list-example-allergies.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "list-example-allergies.ttl")));
-  }
-  @Test
-  public void test_linkage_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("linkage-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "linkage-example.ttl")));
-  }
-  @Test
-  public void test_library_exclusive_breastfeeding_cqm_logic() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("library-exclusive-breastfeeding-cqm-logic.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "library-exclusive-breastfeeding-cqm-logic.ttl")));
-  }
-  @Test
-  public void test_library_exclusive_breastfeeding_cds_logic() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("library-exclusive-breastfeeding-cds-logic.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "library-exclusive-breastfeeding-cds-logic.ttl")));
-  }
-  @Test
-  public void test_library_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("library-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "library-example.ttl")));
-  }
-  @Test
-  public void test_library_cms146_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("library-cms146-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "library-cms146-example.ttl")));
-  }
-  @Test
-  public void test_implementationguide_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("implementationguide-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "implementationguide-example.ttl")));
-  }
-  @Test
-  public void test_immunizationrecommendation_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("immunizationrecommendation-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "immunizationrecommendation-example.ttl")));
-  }
-  @Test
-  public void test_immunization_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("immunization-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "immunization-example.ttl")));
-  }
-  @Test
-  public void test_immunization_example_refused() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("immunization-example-refused.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "immunization-example-refused.ttl")));
-  }
-  @Test
-  public void test_imagingstudy_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("imagingstudy-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "imagingstudy-example.ttl")));
-  }
-  @Test
-  public void test_healthcareservice_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("healthcareservice-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "healthcareservice-example.ttl")));
-  }
-  @Test
-  public void test_guidanceresponse_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("guidanceresponse-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "guidanceresponse-example.ttl")));
-  }
-  @Test
-  public void test_group_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("group-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "group-example.ttl")));
-  }
-  @Test
-  public void test_group_example_member() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("group-example-member.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "group-example-member.ttl")));
-  }
-  @Test
-  public void test_goal_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("goal-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "goal-example.ttl")));
-  }
-  @Test
-  public void test_flag_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("flag-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "flag-example.ttl")));
-  }
-  @Test
-  public void test_flag_example_encounter() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("flag-example-encounter.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "flag-example-encounter.ttl")));
-  }
-  @Test
-  public void test_familymemberhistory_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("familymemberhistory-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "familymemberhistory-example.ttl")));
-  }
-  @Test
-  public void test_familymemberhistory_example_mother() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("familymemberhistory-example-mother.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "familymemberhistory-example-mother.ttl")));
-  }
-  @Test
-  public void test_explanationofbenefit_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("explanationofbenefit-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "explanationofbenefit-example.ttl")));
-  }
-  @Test
-  public void test_episodeofcare_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("episodeofcare-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "episodeofcare-example.ttl")));
-  }
-  @Test
-  public void test_enrollmentresponse_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("enrollmentresponse-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "enrollmentresponse-example.ttl")));
-  }
-  @Test
-  public void test_enrollmentrequest_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("enrollmentrequest-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "enrollmentrequest-example.ttl")));
-  }
-  @Test
-  public void test_endpoint_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("endpoint-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "endpoint-example.ttl")));
-  }
-  @Test
-  public void test_encounter_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example.ttl")));
-  }
-  @Test
-  public void test_encounter_example_xcda() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-xcda.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-xcda.ttl")));
-  }
-  @Test
-  public void test_encounter_example_home() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-home.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-home.ttl")));
-  }
-  @Test
-  public void test_encounter_example_f203_20130311() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-f203-20130311.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-f203-20130311.ttl")));
-  }
-  @Test
-  public void test_encounter_example_f202_20130128() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-f202-20130128.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-f202-20130128.ttl")));
-  }
-  @Test
-  public void test_encounter_example_f201_20130404() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-f201-20130404.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-f201-20130404.ttl")));
-  }
-  @Test
-  public void test_encounter_example_f003_abscess() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-f003-abscess.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-f003-abscess.ttl")));
-  }
-  @Test
-  public void test_encounter_example_f002_lung() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-f002-lung.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-f002-lung.ttl")));
-  }
-  @Test
-  public void test_encounter_example_f001_heart() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("encounter-example-f001-heart.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "encounter-example-f001-heart.ttl")));
-  }
-  @Test
-  public void test_eligibilityresponse_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("eligibilityresponse-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "eligibilityresponse-example.ttl")));
-  }
-  @Test
-  public void test_eligibilityrequest_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("eligibilityrequest-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "eligibilityrequest-example.ttl")));
-  }
-  @Test
-  public void test_documentreference_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("documentreference-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "documentreference-example.ttl")));
-  }
-  @Test
-  public void test_documentmanifest_fm_attachment() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("documentmanifest-fm-attachment.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "documentmanifest-fm-attachment.ttl")));
-  }
-  @Test
-  public void test_document_example_dischargesummary() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("document-example-dischargesummary.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "document-example-dischargesummary.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_micro1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-micro1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-micro1.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_hla_genetics_results_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-hla-genetics-results-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-hla-genetics-results-example.ttl")));
-  }
-  
-  @Test
-  public void test_diagnosticreport_genetics_comprehensive_bone_marrow_report() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-genetics-comprehensive-bone-marrow-report.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-genetics-comprehensive-bone-marrow-report.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_examples_general() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-examples-general.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-examples-general.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_example_ultrasound() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-example-ultrasound.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-example-ultrasound.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_example_lipids() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-example-lipids.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-example-lipids.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_example_ghp() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-example-ghp.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-example-ghp.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_example_f202_bloodculture() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-example-f202-bloodculture.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-example-f202-bloodculture.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_example_f201_brainct() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-example-f201-brainct.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-example-f201-brainct.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_example_f001_bloodexam() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-example-f001-bloodexam.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-example-f001-bloodexam.ttl")));
-  }
-  @Test
-  public void test_diagnosticreport_example_dxa() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("diagnosticreport-example-dxa.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "diagnosticreport-example-dxa.ttl")));
-  }
-  @Test
-  public void test_deviceusestatement_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("deviceusestatement-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "deviceusestatement-example.ttl")));
-  }
-  @Test
-  public void test_devicemetric_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("devicemetric-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "devicemetric-example.ttl")));
-  }
-  @Test
-  public void test_devicecomponent_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("devicecomponent-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "devicecomponent-example.ttl")));
-  }
-  @Test
-  public void test_devicecomponent_example_prodspec() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("devicecomponent-example-prodspec.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "devicecomponent-example-prodspec.ttl")));
-  }
-  @Test
-  public void test_device_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("device-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "device-example.ttl")));
-  }
-  @Test
-  public void test_device_example_udi1() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("device-example-udi1.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "device-example-udi1.ttl")));
-  }
-  @Test
-  public void test_device_example_software() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("device-example-software.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "device-example-software.ttl")));
-  }
-  @Test
-  public void test_device_example_pacemaker() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("device-example-pacemaker.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "device-example-pacemaker.ttl")));
-  }
-  @Test
-  public void test_device_example_ihe_pcd() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("device-example-ihe-pcd.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "device-example-ihe-pcd.ttl")));
-  }
-  @Test
-  public void test_device_example_f001_feedingtube() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("device-example-f001-feedingtube.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "device-example-f001-feedingtube.ttl")));
-  }
-  @Test
-  public void test_detectedissue_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("detectedissue-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "detectedissue-example.ttl")));
-  }
-  @Test
-  public void test_detectedissue_example_lab() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("detectedissue-example-lab.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "detectedissue-example-lab.ttl")));
-  }
-  @Test
-  public void test_detectedissue_example_dup() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("detectedissue-example-dup.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "detectedissue-example-dup.ttl")));
-  }
-  @Test
-  public void test_detectedissue_example_allergy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("detectedissue-example-allergy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "detectedissue-example-allergy.ttl")));
-  }
-  @Test
-  public void test_coverage_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("coverage-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "coverage-example.ttl")));
-  }
-  @Test
-  public void test_coverage_example_2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("coverage-example-2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "coverage-example-2.ttl")));
-  }
-  @Test
-  public void test_contract_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("contract-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "contract-example.ttl")));
-  }
-  @Test
-  public void test_condition_example2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example2.ttl")));
-  }
-  @Test
-  public void test_condition_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example.ttl")));
-  }
-  @Test
-  public void test_condition_example_stroke() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-stroke.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-stroke.ttl")));
-  }
-  @Test
-  public void test_condition_example_f205_infection() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f205-infection.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f205-infection.ttl")));
-  }
-  @Test
-  public void test_condition_example_f204_renal() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f204-renal.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f204-renal.ttl")));
-  }
-  @Test
-  public void test_condition_example_f203_sepsis() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f203-sepsis.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f203-sepsis.ttl")));
-  }
-  @Test
-  public void test_condition_example_f202_malignancy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f202-malignancy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f202-malignancy.ttl")));
-  }
-  @Test
-  public void test_condition_example_f201_fever() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f201-fever.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f201-fever.ttl")));
-  }
-  @Test
-  public void test_condition_example_f003_abscess() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f003-abscess.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f003-abscess.ttl")));
-  }
-  @Test
-  public void test_condition_example_f002_lung() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f002-lung.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f002-lung.ttl")));
-  }
-  @Test
-  public void test_condition_example_f001_heart() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("condition-example-f001-heart.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "condition-example-f001-heart.ttl")));
-  }
-  @Test
-  public void test_conceptmap_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("conceptmap-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "conceptmap-example.ttl")));
-  }
-  @Test
-  public void test_conceptmap_example_specimen_type() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("conceptmap-example-specimen-type.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "conceptmap-example-specimen-type.ttl")));
-  }
-  @Test
-  public void test_conceptmap_103() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("conceptmap-103.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "conceptmap-103.ttl")));
-  }
-  @Test
-  public void test_composition_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("composition-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "composition-example.ttl")));
-  }
-  @Test
-  public void test_communicationrequest_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("communicationrequest-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "communicationrequest-example.ttl")));
-  }
-  @Test
-  public void test_communication_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("communication-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "communication-example.ttl")));
-  }
-  @Test
-  public void test_codesystem_nhin_purposeofuse() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("codesystem-nhin-purposeofuse.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "codesystem-nhin-purposeofuse.ttl")));
-  }
-  @Test
-  public void test_codesystem_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("codesystem-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "codesystem-example.ttl")));
-  }
-  @Test
-  public void test_clinicalimpression_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("clinicalimpression-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "clinicalimpression-example.ttl")));
-  }
-  @Test
-  public void test_claimresponse_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claimresponse-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claimresponse-example.ttl")));
-  }
-  @Test
-  public void test_claim_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example.ttl")));
-  }
-  @Test
-  public void test_claim_example_vision() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-vision.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-vision.ttl")));
-  }
-  @Test
-  public void test_claim_example_vision_glasses() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-vision-glasses.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-vision-glasses.ttl")));
-  }
-  @Test
-  public void test_claim_example_professional() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-professional.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-professional.ttl")));
-  }
-  @Test
-  public void test_claim_example_pharmacy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-pharmacy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-pharmacy.ttl")));
-  }
-  @Test
-  public void test_claim_example_oral_orthoplan() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-oral-orthoplan.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-oral-orthoplan.ttl")));
-  }
-  @Test
-  public void test_claim_example_oral_identifier() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-oral-identifier.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-oral-identifier.ttl")));
-  }
-  @Test
-  public void test_claim_example_oral_contained() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-oral-contained.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-oral-contained.ttl")));
-  }
-  @Test
-  public void test_claim_example_oral_contained_identifier() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-oral-contained-identifier.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-oral-contained-identifier.ttl")));
-  }
-  @Test
-  public void test_claim_example_oral_average() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-oral-average.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-oral-average.ttl")));
-  }
-  @Test
-  public void test_claim_example_institutional() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("claim-example-institutional.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "claim-example-institutional.ttl")));
-  }
-  @Test
-  public void test_careteam_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careteam-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careteam-example.ttl")));
-  }
-  @Test
-  public void test_careplan_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example.ttl")));
-  }
-  @Test
-  public void test_careplan_example_pregnancy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-pregnancy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-pregnancy.ttl")));
-  }
-  @Test
-  public void test_careplan_example_integrated() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-integrated.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-integrated.ttl")));
-  }
-  @Test
-  public void test_careplan_example_GPVisit() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-GPVisit.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-GPVisit.ttl")));
-  }
-  @Test
-  public void test_careplan_example_f203_sepsis() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-f203-sepsis.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-f203-sepsis.ttl")));
-  }
-  @Test
-  public void test_careplan_example_f202_malignancy() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-f202-malignancy.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-f202-malignancy.ttl")));
-  }
-  @Test
-  public void test_careplan_example_f201_renal() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-f201-renal.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-f201-renal.ttl")));
-  }
-  @Test
-  public void test_careplan_example_f003_pharynx() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-f003-pharynx.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-f003-pharynx.ttl")));
-  }
-  @Test
-  public void test_careplan_example_f002_lung() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-f002-lung.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-f002-lung.ttl")));
-  }
-  @Test
-  public void test_careplan_example_f001_heart() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("careplan-example-f001-heart.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "careplan-example-f001-heart.ttl")));
-  }
-  @Test
-  public void test_bundle_transaction() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("bundle-transaction.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "bundle-transaction.ttl")));
-  }
-  @Test
-  public void test_bundle_response() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("bundle-response.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "bundle-response.ttl")));
-  }
-  @Test
-  public void test_bundle_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("bundle-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "bundle-example.ttl")));
-  }
-  @Test
-  public void test_binary_f006() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("binary-f006.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "binary-f006.ttl")));
-  }
-  @Test
-  public void test_binary_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("binary-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "binary-example.ttl")));
-  }
-  @Test
-  public void test_basic_example2() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("basic-example2.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "basic-example2.ttl")));
-  }
-  @Test
-  public void test_basic_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("basic-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "basic-example.ttl")));
-  }
-  @Test
-  public void test_basic_example_narrative() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("basic-example-narrative.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "basic-example-narrative.ttl")));
-  }
-  @Test
-  public void test_auditevent_example() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("auditevent-example.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "auditevent-example.ttl")));
-  }
-  @Test
-  public void test_auditevent_example_disclosure() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("auditevent-example-disclosure.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "auditevent-example-disclosure.ttl")));
-  }
-  @Test
-  public void test_audit_event_example_vread() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("audit-event-example-vread.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "audit-event-example-vread.ttl")));
-  }
-  @Test
-  public void test_audit_event_example_search() throws FileNotFoundException, IOException, Exception {
-    if (!TestingUtilities.silent)
-      System.out.println("audit-event-example-search.ttl");
-    new Turtle().parse(TextFile.fileToString(Utilities.path(TestingUtilities.home(), "publish", "audit-event-example-search.ttl")));
-  }
-  
-
-}
diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ExamineTestTrace.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ExamineTestTrace.java
index 4a1e9a74555..6f36d5b953d 100644
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ExamineTestTrace.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ExamineTestTrace.java
@@ -14,12 +14,18 @@ public class ExamineTestTrace {
 	private static final Logger ourLog = LoggerFactory.getLogger(ExamineTestTrace.class);
 
 	public static void main(String[] aaa) {
-		String input = "Running ca.uhn.fhir.model.primitive.BaseResourceReferenceDtTest\n" +
-			"Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.896 sec - in ca.uhn.fhir.rest.server.OperationServerWithSearchParamTypesDstu2Test";
+		String input = "[INFO] Running ca.uhn.fhir.rest.client.RestfulClientFactoryDstu2Test\n" +
+			"[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.982 s - in ca.uhn.fhir.validation.ResourceValidatorDstu2Test";
 
 		Set<String> started = new HashSet<>();
 		Set<String> finished = new HashSet<>();
 		for (String next : input.split("\n")) {
+			if (next.startsWith("[INFO] ")) {
+				next = next.substring("[INFO] ".length());
+			}
+			if (next.startsWith("[WARNING] ")) {
+				next = next.substring("[WARNING] ".length());
+			}
 			if (next.startsWith("Running ")) {
 				started.add(next.substring("Running ".length()));
 			} else if (next.startsWith("Tests run: ")) {
@@ -27,7 +33,7 @@ public class ExamineTestTrace {
 			} else if (isBlank(next)) {
 				continue;
 			} else {
-				throw new IllegalStateException();
+				throw new IllegalStateException("Unknown line: " + next);
 			}
 		}
 
diff --git a/pom.xml b/pom.xml
index b4c2c1b6367..1bb8cc416ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1117,7 +1117,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.19.1</version>
+					<version>2.20.1</version>
 					<configuration>
 						<redirectTestOutputToFile>true</redirectTestOutputToFile>
 						<runOrder>random</runOrder>