diff --git a/phpunit/Core.xml b/phpunit/Core.xml
index f751a4af..5a7f441f 100644
--- a/phpunit/Core.xml
+++ b/phpunit/Core.xml
@@ -15,8 +15,8 @@
     </php>
     <testsuites>
         <testsuite name="Core">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests</directory>
-            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions</exclude>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated</directory>
+            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions</exclude>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/DSTU1.xml b/phpunit/DSTU1.xml
index d0306c8c..f0d80644 100644
--- a/phpunit/DSTU1.xml
+++ b/phpunit/DSTU1.xml
@@ -15,7 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="DSTU1">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/DSTU1/Tests</directory>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/DSTU1</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/DSTU2.xml b/phpunit/DSTU2.xml
index 5c815073..dd34dd8d 100644
--- a/phpunit/DSTU2.xml
+++ b/phpunit/DSTU2.xml
@@ -15,7 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="DSTU2">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/DSTU2/Tests</directory>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/DSTU2</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/R4.xml b/phpunit/R4.xml
index 16802121..a45b9082 100644
--- a/phpunit/R4.xml
+++ b/phpunit/R4.xml
@@ -15,7 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="R4">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/R4/Tests</directory>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/R4</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/R4B.xml b/phpunit/R4B.xml
index 7f6f80e3..148f598e 100644
--- a/phpunit/R4B.xml
+++ b/phpunit/R4B.xml
@@ -15,7 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="R4B">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/R4B/Tests</directory>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/R4B</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/R5.xml b/phpunit/R5.xml
index 3df7fd0f..4f69d123 100644
--- a/phpunit/R5.xml
+++ b/phpunit/R5.xml
@@ -15,7 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="R5">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/R5/Tests</directory>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/R5</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/STU3.xml b/phpunit/STU3.xml
index 6fbd493a..8b7a3003 100644
--- a/phpunit/STU3.xml
+++ b/phpunit/STU3.xml
@@ -15,7 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="STU3">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/STU3/Tests</directory>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions/STU3</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
index 819fd8b8..87214109 100644
--- a/phpunit/bootstrap.php
+++ b/phpunit/bootstrap.php
@@ -19,10 +19,7 @@
 const PHPFHIR_TEST_CONFIG_ROOT_DIR = __DIR__;
 const PHPFHIR_TEST_CONFIG_FILE = PHPFHIR_TEST_CONFIG_ROOT_DIR . '/config.php';
 const PHPFHIR_TEST_COMPOSER_AUTOLOADER_PATH = PHPFHIR_TEST_CONFIG_ROOT_DIR . '/../vendor/autoload.php';
-const PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR = PHPFHIR_TEST_CONFIG_ROOT_DIR . '/../output/tests/resources';
-const PHPFHIR_TETS_GENERATED_AUTOLOADER_PATH = PHPFHIR_TEST_CONFIG_ROOT_DIR . '/../output/DCarbone/PHPFHIRGenerated/Autoloader.php';
-
-putenv('PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR=' . PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR);
+const PHPFHIR_TETS_GENERATED_AUTOLOADER_PATH = PHPFHIR_TEST_CONFIG_ROOT_DIR . '/../output/src/DCarbone/PHPFHIRGenerated/Autoloader.php';
 
 // require generator autoloader
 (function () {
@@ -40,12 +37,6 @@
     $builder->render();
 })();
 
-// ensure test resource download directory exists
-echo 'Creating test resource download dir: ' . PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR . PHP_EOL;
-if (!is_dir(PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR) && !mkdir(PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR, 0755, true)) {
-    throw new \RuntimeException(sprintf('Failed to create test resource download directory: %s', PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR));
-}
-
 // require generated autoloader
 (function () {
     $generated_autoloader = realpath(PHPFHIR_TETS_GENERATED_AUTOLOADER_PATH);