diff --git a/.gitignore b/.gitignore
index 8d59e189..b13a58da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .DS_Store
 composer.lock
-*.composer.lock
+composer.dingo.lock
 .php_cs.cache
 /vendor/
 public/
diff --git a/phpunit.xml b/phpunit.xml
index e2c4899d..f589b88d 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -10,24 +10,24 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
+        <testsuite name="Full Test">
+            <file>tests/GenerateDocumentationTest.php</file>
+        </testsuite>
         <testsuite name="Generator Tests">
             <file>tests/Unit/DingoGeneratorTest.php</file>
             <file>tests/Unit/LaravelGeneratorTest.php</file>
             <file>tests/Unit/GeneratorPluginSystemTest.php</file>
         </testsuite>
+        <testsuite name="Strategies">
+            <directory>tests/Strategies</directory>
+        </testsuite>
         <testsuite name="RouteMatcher Tests">
             <file>tests/Unit/RouteMatcherDingoTest.php</file>
             <file>tests/Unit/RouteMatcherTest.php</file>
         </testsuite>
-        <testsuite name="Full Test">
-            <file>tests/GenerateDocumentationTest.php</file>
-        </testsuite>
-        <testsuite name="Postman Collection Test">
+        <testsuite name="Other Unit Tests">
             <file>tests/Unit/PostmanCollectionWriterTest.php</file>
-            <file>tests/Tools/AnnotationParserTest.php</file>
-        </testsuite>
-        <testsuite name="Strategies">
-            <directory>tests/Extracting/Strategies</directory>
+            <file>tests/Unit/AnnotationParserTest.php</file>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/tests/Extracting/Strategies/BodyParameters/GetFromBodyParamTagTest.php b/tests/Strategies/BodyParameters/GetFromBodyParamTagTest.php
similarity index 99%
rename from tests/Extracting/Strategies/BodyParameters/GetFromBodyParamTagTest.php
rename to tests/Strategies/BodyParameters/GetFromBodyParamTagTest.php
index b87c30be..59bc15b2 100644
--- a/tests/Extracting/Strategies/BodyParameters/GetFromBodyParamTagTest.php
+++ b/tests/Strategies/BodyParameters/GetFromBodyParamTagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\BodyParameters;
+namespace Knuckles\Scribe\Tests\Strategies\BodyParameters;
 
 use Illuminate\Routing\Route;
 use Knuckles\Scribe\Extracting\Strategies\BodyParameters\GetFromBodyParamTag;
diff --git a/tests/Extracting/Strategies/BodyParameters/GetFromFormRequestTest.php b/tests/Strategies/BodyParameters/GetFromFormRequestTest.php
similarity index 99%
rename from tests/Extracting/Strategies/BodyParameters/GetFromFormRequestTest.php
rename to tests/Strategies/BodyParameters/GetFromFormRequestTest.php
index 8c2d4d58..3ffd5d25 100644
--- a/tests/Extracting/Strategies/BodyParameters/GetFromFormRequestTest.php
+++ b/tests/Strategies/BodyParameters/GetFromFormRequestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\BodyParameters;
+namespace Knuckles\Scribe\Tests\Strategies\BodyParameters;
 
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Extracting/Strategies/Metadata/GetFromDocBlocksTest.php b/tests/Strategies/Metadata/GetFromDocBlocksTest.php
similarity index 97%
rename from tests/Extracting/Strategies/Metadata/GetFromDocBlocksTest.php
rename to tests/Strategies/Metadata/GetFromDocBlocksTest.php
index 857758a8..17f2022d 100644
--- a/tests/Extracting/Strategies/Metadata/GetFromDocBlocksTest.php
+++ b/tests/Strategies/Metadata/GetFromDocBlocksTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\Metadata;
+namespace Knuckles\Scribe\Tests\Strategies\Metadata;
 
 use Knuckles\Scribe\Extracting\Strategies\Metadata\GetFromDocBlocks;
 use Knuckles\Scribe\Tools\DocumentationConfig;
diff --git a/tests/Extracting/Strategies/QueryParameters/GetFromQueryParamTagTest.php b/tests/Strategies/QueryParameters/GetFromQueryParamTagTest.php
similarity index 97%
rename from tests/Extracting/Strategies/QueryParameters/GetFromQueryParamTagTest.php
rename to tests/Strategies/QueryParameters/GetFromQueryParamTagTest.php
index 43d2edfa..886593b2 100644
--- a/tests/Extracting/Strategies/QueryParameters/GetFromQueryParamTagTest.php
+++ b/tests/Strategies/QueryParameters/GetFromQueryParamTagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\QueryParameters;
+namespace Knuckles\Scribe\Tests\Strategies\QueryParameters;
 
 use Illuminate\Routing\Route;
 use Knuckles\Scribe\Extracting\Strategies\QueryParameters\GetFromQueryParamTag;
diff --git a/tests/Extracting/Strategies/ResponseFields/GetFromResponseFieldTagTest.php b/tests/Strategies/ResponseFields/GetFromResponseFieldTagTest.php
similarity index 97%
rename from tests/Extracting/Strategies/ResponseFields/GetFromResponseFieldTagTest.php
rename to tests/Strategies/ResponseFields/GetFromResponseFieldTagTest.php
index a9e2a9d1..08e2abf1 100644
--- a/tests/Extracting/Strategies/ResponseFields/GetFromResponseFieldTagTest.php
+++ b/tests/Strategies/ResponseFields/GetFromResponseFieldTagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\ResponseFields;
+namespace Knuckles\Scribe\Tests\Strategies\ResponseFields;
 
 use Knuckles\Scribe\Extracting\Strategies\ResponseFields\GetFromResponseFieldTag;
 use Knuckles\Scribe\Tools\DocumentationConfig;
diff --git a/tests/Extracting/Strategies/Responses/ResponseCallsTest.php b/tests/Strategies/Responses/ResponseCallsTest.php
similarity index 98%
rename from tests/Extracting/Strategies/Responses/ResponseCallsTest.php
rename to tests/Strategies/Responses/ResponseCallsTest.php
index 05001890..cb07147e 100644
--- a/tests/Extracting/Strategies/Responses/ResponseCallsTest.php
+++ b/tests/Strategies/Responses/ResponseCallsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\Responses;
+namespace Knuckles\Scribe\Tests\Strategies\Responses;
 
 use Dingo\Api\Routing\Router;
 use Illuminate\Routing\Route;
@@ -9,10 +9,8 @@
 use Knuckles\Scribe\Tests\Fixtures\TestController;
 use Knuckles\Scribe\Tools\DocumentationConfig;
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
-use Knuckles\Scribe\Tools\Flags;
 use Orchestra\Testbench\TestCase;
 use Illuminate\Support\Facades\Route as LaravelRouteFacade;
-use Dingo\Api\Routing\Router as DingoRouter;
 
 class ResponseCallsTest extends TestCase
 {
diff --git a/tests/Extracting/Strategies/Responses/UseApiResourceTagsTest.php b/tests/Strategies/Responses/UseApiResourceTagsTest.php
similarity index 98%
rename from tests/Extracting/Strategies/Responses/UseApiResourceTagsTest.php
rename to tests/Strategies/Responses/UseApiResourceTagsTest.php
index eec1deee..4f3b20f3 100644
--- a/tests/Extracting/Strategies/Responses/UseApiResourceTagsTest.php
+++ b/tests/Strategies/Responses/UseApiResourceTagsTest.php
@@ -1,10 +1,8 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\Responses;
+namespace Knuckles\Scribe\Tests\Strategies\Responses;
 
-use Knuckles\Scribe\Extracting\Generator;
 use Knuckles\Scribe\Extracting\Strategies\Responses\UseApiResourceTags;
-use Knuckles\Scribe\Extracting\Strategies\Responses\UseTransformerTags;
 use Knuckles\Scribe\ScribeServiceProvider;
 use Knuckles\Scribe\Tests\Fixtures\TestUser;
 use Knuckles\Scribe\Tools\DocumentationConfig;
diff --git a/tests/Extracting/Strategies/Responses/UseResponseFileTagTest.php b/tests/Strategies/Responses/UseResponseFileTagTest.php
similarity index 92%
rename from tests/Extracting/Strategies/Responses/UseResponseFileTagTest.php
rename to tests/Strategies/Responses/UseResponseFileTagTest.php
index 0ab673c0..01fd6a52 100644
--- a/tests/Extracting/Strategies/Responses/UseResponseFileTagTest.php
+++ b/tests/Strategies/Responses/UseResponseFileTagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\Responses;
+namespace Knuckles\Scribe\Tests\Strategies\Responses;
 
 use Knuckles\Scribe\Extracting\Strategies\Responses\UseResponseFileTag;
 use Knuckles\Scribe\ScribeServiceProvider;
@@ -30,8 +30,8 @@ protected function getPackageProviders($app)
      */
     public function allows_multiple_responsefile_tags_for_multiple_statuses_and_scenarios(array $tags, array $expected)
     {
-        $filePath =  __DIR__ . '/../../../Fixtures/response_test.json';
-        $filePath2 =  __DIR__ . '/../../../Fixtures/response_error_test.json';
+        $filePath =  __DIR__ . '/../../Fixtures/response_test.json';
+        $filePath2 =  __DIR__ . '/../../Fixtures/response_error_test.json';
 
         copy($filePath, storage_path('response_test.json'));
         copy($filePath2, storage_path('response_error_test.json'));
@@ -60,7 +60,7 @@ public function allows_multiple_responsefile_tags_for_multiple_statuses_and_scen
     public function can_add_or_replace_key_value_pair_in_response_file()
     {
 
-        $filePath = __DIR__ . '/../../../Fixtures/response_test.json';
+        $filePath = __DIR__ . '/../../Fixtures/response_test.json';
         copy($filePath, storage_path('response_test.json'));
 
         $strategy = new UseResponseFileTag(new DocumentationConfig([]));
diff --git a/tests/Extracting/Strategies/Responses/UseResponseTagTest.php b/tests/Strategies/Responses/UseResponseTagTest.php
similarity index 97%
rename from tests/Extracting/Strategies/Responses/UseResponseTagTest.php
rename to tests/Strategies/Responses/UseResponseTagTest.php
index 6468109d..398ed2ad 100644
--- a/tests/Extracting/Strategies/Responses/UseResponseTagTest.php
+++ b/tests/Strategies/Responses/UseResponseTagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\Responses;
+namespace Knuckles\Scribe\Tests\Strategies\Responses;
 
 use Knuckles\Scribe\Extracting\Strategies\Responses\UseResponseTag;
 use Knuckles\Scribe\Tools\DocumentationConfig;
diff --git a/tests/Extracting/Strategies/Responses/UseTransformerTagsTest.php b/tests/Strategies/Responses/UseTransformerTagsTest.php
similarity index 98%
rename from tests/Extracting/Strategies/Responses/UseTransformerTagsTest.php
rename to tests/Strategies/Responses/UseTransformerTagsTest.php
index 1cc46361..e7baa7b7 100644
--- a/tests/Extracting/Strategies/Responses/UseTransformerTagsTest.php
+++ b/tests/Strategies/Responses/UseTransformerTagsTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\Responses;
+namespace Knuckles\Scribe\Tests\Strategies\Responses;
 
 use Knuckles\Scribe\Extracting\Strategies\Responses\UseTransformerTags;
 use Knuckles\Scribe\ScribeServiceProvider;
-use Knuckles\Scribe\Tests\Fixtures\TestModel;
 use Knuckles\Scribe\Tests\Fixtures\TestUser;
 use Knuckles\Scribe\Tools\DocumentationConfig;
 use Mpociot\Reflection\DocBlock\Tag;
diff --git a/tests/Extracting/Strategies/UrlParameters/GetFromUrlParamTagTest.php b/tests/Strategies/UrlParameters/GetFromUrlParamTagTest.php
similarity index 93%
rename from tests/Extracting/Strategies/UrlParameters/GetFromUrlParamTagTest.php
rename to tests/Strategies/UrlParameters/GetFromUrlParamTagTest.php
index dadfcf4e..e025f876 100644
--- a/tests/Extracting/Strategies/UrlParameters/GetFromUrlParamTagTest.php
+++ b/tests/Strategies/UrlParameters/GetFromUrlParamTagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knuckles\Scribe\Tests\Extracting\Strategies\UrlParameters;
+namespace Knuckles\Scribe\Tests\Strategies\UrlParameters;
 
 use Knuckles\Scribe\Extracting\Strategies\UrlParameters\GetFromUrlParamTag;
 use Knuckles\Scribe\Tools\DocumentationConfig;
diff --git a/tests/Tools/AnnotationParserTest.php b/tests/Unit/AnnotationParserTest.php
similarity index 95%
rename from tests/Tools/AnnotationParserTest.php
rename to tests/Unit/AnnotationParserTest.php
index 17b10e25..d22ccc9d 100644
--- a/tests/Tools/AnnotationParserTest.php
+++ b/tests/Unit/AnnotationParserTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Knuckles\Scribe\Tools;
+namespace Knuckles\Scribe\Tests\Unit;
 
+use Knuckles\Scribe\Tools\AnnotationParser;
 use PHPUnit\Framework\TestCase;
 
 class AnnotationParserTest extends TestCase
diff --git a/tests/Unit/GeneratorPluginSystemTestCase.php b/tests/Unit/GeneratorPluginSystemTestCase.php
index 7586a0cf..4179a654 100644
--- a/tests/Unit/GeneratorPluginSystemTestCase.php
+++ b/tests/Unit/GeneratorPluginSystemTestCase.php
@@ -4,13 +4,11 @@
 
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use Illuminate\Routing\Route;
-use Knuckles\Scribe\ScribeServiceProvider;
 use Knuckles\Scribe\Extracting\Generator;
 use Knuckles\Scribe\Extracting\Strategies\Strategy;
+use Knuckles\Scribe\ScribeServiceProvider;
 use Knuckles\Scribe\Tests\Fixtures\TestController;
 use Knuckles\Scribe\Tools\DocumentationConfig;
-use ReflectionClass;
-use ReflectionMethod;
 
 class GeneratorPluginSystemTestCase extends LaravelGeneratorTest
 {
@@ -167,6 +165,7 @@ public function dataResources()
     }
 }
 
+
 class EmptyStrategy1 extends Strategy
 {
     public static $called = [];