diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java
index c33c0fe566..00f225693c 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java
@@ -1,7 +1,5 @@
 package org.hl7.fhir.r5.test;
 
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -10,14 +8,13 @@
 import org.hl7.fhir.r5.model.CapabilityStatement;
 import org.hl7.fhir.r5.openapi.OpenApiGenerator;
 import org.hl7.fhir.r5.openapi.Writer;
-import org.hl7.fhir.r5.test.utils.CompareUtilities;
 import org.hl7.fhir.r5.test.utils.TestingUtilities;
 import org.hl7.fhir.utilities.filesystem.ManagedFileAccess;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-public class OpenApiGeneratorTest {
+class OpenApiGeneratorTest {
 
   @Test
   void testBase1() {
@@ -29,28 +26,28 @@ void testBase1() {
   }
 
   @Test
-  void testBase2() {
-    assertDoesNotThrow(() -> {
-      InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-base2.json");
-      String dfn = TestingUtilities.tempFile("openapi", "swagger-base2.json");
-      run(sfn, dfn);
-    });
-  }
-
-  @Test
-  void testExtendedOperations() {
-    assertDoesNotThrow(() -> {
-      InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-r5-extended.json");
-      String dfn = TestingUtilities.tempFile("openapi", "swagger-extended.json");
-      run(sfn, dfn);
-    });
-  }
-
-  public void run(InputStream sfn, String dfn) throws IOException, FHIRFormatError, FileNotFoundException {
-    CapabilityStatement cs = (CapabilityStatement) new JsonParser().parse(sfn);
-    Writer oa = new Writer(ManagedFileAccess.outStream(dfn));
-    OpenApiGenerator gen = new OpenApiGenerator(TestingUtilities.getSharedWorkerContext(), cs, oa);
-    gen.generate("test-lic", "http://spdx.org/licenses/test-lic.html");
+  void testBase2() {
+    assertDoesNotThrow(() -> {
+      InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-base2.json");
+      String dfn = TestingUtilities.tempFile("openapi", "swagger-base2.json");
+      run(sfn, dfn);
+    });
+  }
+
+  @Test
+  void testExtendedOperations() {
+    assertDoesNotThrow(() -> {
+      InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-r5-extended.json");
+      String dfn = TestingUtilities.tempFile("openapi", "swagger-extended.json");
+      run(sfn, dfn);
+    });
+  }
+
+  public void run(InputStream sfn, String dfn) throws IOException, FHIRFormatError {
+    CapabilityStatement cs = (CapabilityStatement) new JsonParser().parse(sfn);
+    Writer oa = new Writer(ManagedFileAccess.outStream(dfn));
+    OpenApiGenerator gen = new OpenApiGenerator(TestingUtilities.getSharedWorkerContext(), cs, oa);
+    gen.generate("test-lic", "http://spdx.org/licenses/test-lic.html");
     oa.commit();
   }
-}
+}
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/narrative/tests/NarrativeGenerationTestsX.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/narrative/tests/NarrativeGenerationXTests.java
similarity index 99%
rename from org.hl7.fhir.validation/src/test/java/org/hl7/fhir/narrative/tests/NarrativeGenerationTestsX.java
rename to org.hl7.fhir.validation/src/test/java/org/hl7/fhir/narrative/tests/NarrativeGenerationXTests.java
index 50e919ce81..2ba74a21a5 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/narrative/tests/NarrativeGenerationTestsX.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/narrative/tests/NarrativeGenerationXTests.java
@@ -28,7 +28,6 @@
 import org.hl7.fhir.r5.test.utils.CompareUtilities;
 import org.hl7.fhir.r5.test.utils.TestPackageLoader;
 import org.hl7.fhir.r5.test.utils.TestingUtilities;
-import org.hl7.fhir.r5.utils.structuremap.StructureMapUtilities;
 import org.hl7.fhir.utilities.FileUtilities;
 import org.hl7.fhir.utilities.TerminologyServiceOptions;
 import org.hl7.fhir.utilities.Utilities;
@@ -56,7 +55,7 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-public class NarrativeGenerationTestsX {
+public class NarrativeGenerationXTests {
 
   public static class TestProfileKnowledgeProvider implements ProfileKnowledgeProvider {
 
diff --git a/pom.xml b/pom.xml
index fd2237be45..c61173aea9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <guava_version>32.0.1-jre</guava_version>
         <gson_version>2.13.1</gson_version>
         <hapi_fhir_version>8.4.0</hapi_fhir_version>
-        <validator_test_case_version>1.7.62</validator_test_case_version>
+        <validator_test_case_version>1.7.63-SNAPSHOT</validator_test_case_version>
         <jackson_version>2.21.3</jackson_version>
         <jackson_annotations_version>2.21</jackson_annotations_version>
         <junit_jupiter_version>5.14.0</junit_jupiter_version>