diff --git a/composer.json b/composer.json
index e601d55..76b250f 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,11 @@
             "Bkwld\\Croppa\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Bkwld\\Croppa\\Test\\": "tests"
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
@@ -41,7 +46,7 @@
                 "Bkwld\\Croppa\\CroppaServiceProvider"
             ],
             "aliases": {
-                "Croppa": "Bkwld\\Croppa\\Facade"
+                "Croppa": "Bkwld\\Croppa\\Facades\\Croppa"
             }
         }
     }
diff --git a/tests/TestDelete.php b/tests/TestDelete.php
index 37326fe..23d37e4 100644
--- a/tests/TestDelete.php
+++ b/tests/TestDelete.php
@@ -1,10 +1,13 @@
 <?php
 
+namespace Bkwld\Croppa\Test;
+
 use Bkwld\Croppa\Helpers;
 use Bkwld\Croppa\Storage;
 use Bkwld\Croppa\URL;
 use Illuminate\Filesystem\FilesystemAdapter;
 use League\Flysystem\DirectoryListing;
+use Mockery;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/TestListAllCrops.php b/tests/TestListAllCrops.php
index c1038ef..9143ee4 100644
--- a/tests/TestListAllCrops.php
+++ b/tests/TestListAllCrops.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace Bkwld\Croppa\Test;
+
 use Bkwld\Croppa\Storage;
 use Illuminate\Filesystem\FilesystemAdapter;
 use League\Flysystem\DirectoryListing;
+use Mockery;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/TestResizing.php b/tests/TestResizing.php
index 17a1e02..1cf49ba 100644
--- a/tests/TestResizing.php
+++ b/tests/TestResizing.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Bkwld\Croppa\Test;
+
 use Bkwld\Croppa\Image;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/TestTooManyCrops.php b/tests/TestTooManyCrops.php
index 2c538cf..f932111 100644
--- a/tests/TestTooManyCrops.php
+++ b/tests/TestTooManyCrops.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace Bkwld\Croppa\Test;
+
 use Bkwld\Croppa\Storage;
 use Illuminate\Filesystem\FilesystemAdapter;
 use League\Flysystem\DirectoryListing;
+use Mockery;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/TestUrlGenerator.php b/tests/TestUrlGenerator.php
index 45e3f73..5fee248 100644
--- a/tests/TestUrlGenerator.php
+++ b/tests/TestUrlGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Bkwld\Croppa\Test;
+
 use Bkwld\Croppa\URL;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/TestUrlMatching.php b/tests/TestUrlMatching.php
index 6034521..a07db3d 100644
--- a/tests/TestUrlMatching.php
+++ b/tests/TestUrlMatching.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Bkwld\Croppa\Test;
+
 use Bkwld\Croppa\URL;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/TestUrlParsing.php b/tests/TestUrlParsing.php
index 0d16510..2eaebf8 100644
--- a/tests/TestUrlParsing.php
+++ b/tests/TestUrlParsing.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace Bkwld\Croppa\Test;
+
+use Bkwld\Croppa\Filters\BlackWhite;
+use Bkwld\Croppa\Filters\Blur;
+use Bkwld\Croppa\Filters\Darkgray;
+use Bkwld\Croppa\Filters\Negative;
+use Bkwld\Croppa\Filters\OrangeWarhol;
+use Bkwld\Croppa\Filters\TurquoiseWarhol;
 use Bkwld\Croppa\URL;
 use PHPUnit\Framework\TestCase;
 
@@ -16,12 +24,12 @@ public function setUp(): void
         $this->url = new URL([
             'path' => 'uploads/(.*)$',
             'filters' => [
-                'gray' => Bkwld\Croppa\Filters\BlackWhite::class,
-                'darkgray' => Bkwld\Croppa\Filters\Darkgray::class,
-                'blur' => Bkwld\Croppa\Filters\Blur::class,
-                'negative' => Bkwld\Croppa\Filters\Negative::class,
-                'orange' => Bkwld\Croppa\Filters\OrangeWarhol::class,
-                'turquoise' => Bkwld\Croppa\Filters\TurquoiseWarhol::class,
+                'gray' => BlackWhite::class,
+                'darkgray' => Darkgray::class,
+                'blur' => Blur::class,
+                'negative' => Negative::class,
+                'orange' => OrangeWarhol::class,
+                'turquoise' => TurquoiseWarhol::class,
             ],
         ]);
     }
@@ -77,8 +85,8 @@ public function testFilters()
     {
         $this->assertEquals([
             '1/2/file.jpg', 200, 100, ['filters' => [
-                new Bkwld\Croppa\Filters\Blur(),
-                new Bkwld\Croppa\Filters\Negative(),
+                new Blur(),
+                new Negative(),
             ]],
         ], $this->url->parse('uploads/1/2/file-200x100-filters(blur,negative).jpg'));
     }