diff --git a/composer.json b/composer.json
index 2d9d0ed3..b31b5588 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,8 @@
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/phpstan": "^1.9",
         "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3",
+        "fakerphp/faker": "^1.23"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/Assets/AnotherListenerStub.php b/tests/Assets/AnotherListenerStub.php
new file mode 100644
index 00000000..7c9f560f
--- /dev/null
+++ b/tests/Assets/AnotherListenerStub.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets;
+
+class AnotherListenerStub
+{
+}
diff --git a/tests/Assets/Auth/AuthenticableMock.php b/tests/Assets/Auth/AuthenticableMock.php
new file mode 100644
index 00000000..6a344306
--- /dev/null
+++ b/tests/Assets/Auth/AuthenticableMock.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Auth;
+
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use LaravelDoctrine\ORM\Auth\Authenticatable;
+
+class AuthenticableMock implements AuthenticatableContract
+{
+    use Authenticatable;
+
+    public function __construct()
+    {
+        $this->password = 'myPassword';
+    }
+}
diff --git a/tests/Assets/Auth/AuthenticableWithNonEmptyConstructorMock.php b/tests/Assets/Auth/AuthenticableWithNonEmptyConstructorMock.php
new file mode 100644
index 00000000..47fc362d
--- /dev/null
+++ b/tests/Assets/Auth/AuthenticableWithNonEmptyConstructorMock.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Auth;
+
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use LaravelDoctrine\ORM\Auth\Authenticatable;
+
+class AuthenticableWithNonEmptyConstructorMock implements AuthenticatableContract
+{
+    use Authenticatable;
+
+    public function __construct(array $passwords)
+    {
+        $this->password = $passwords[0];
+    }
+}
diff --git a/tests/Assets/Auth/Passwords/UserMock.php b/tests/Assets/Auth/Passwords/UserMock.php
new file mode 100644
index 00000000..c106b527
--- /dev/null
+++ b/tests/Assets/Auth/Passwords/UserMock.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Auth\Passwords;
+
+use Illuminate\Contracts\Auth\CanResetPassword;
+
+class UserMock implements CanResetPassword
+{
+    /**
+     * Get the e-mail address where password reset links are sent.
+     * @return string
+     */
+    public function getEmailForPasswordReset()
+    {
+        return 'user@mockery.mock';
+    }
+
+    /**
+     * Send the password reset notification.
+     *
+     * @param  string $token
+     * @return void
+     */
+    public function sendPasswordResetNotification($token)
+    {
+        // TODO: Implement sendPasswordResetNotification() method.
+    }
+}
diff --git a/tests/Assets/Configuration/TypeMock.php b/tests/Assets/Configuration/TypeMock.php
new file mode 100644
index 00000000..3a3c092b
--- /dev/null
+++ b/tests/Assets/Configuration/TypeMock.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Configuration;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+class TypeMock extends Type
+{
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+    {
+        return '';
+    }
+
+    public function getName()
+    {
+    }
+}
diff --git a/tests/Assets/Configuration/TypeMock2.php b/tests/Assets/Configuration/TypeMock2.php
new file mode 100644
index 00000000..f094c49f
--- /dev/null
+++ b/tests/Assets/Configuration/TypeMock2.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Configuration;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+class TypeMock2 extends Type
+{
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+    {
+        return '';
+    }
+
+    public function getName()
+    {
+    }
+}
diff --git a/tests/Assets/Decorator.php b/tests/Assets/Decorator.php
new file mode 100644
index 00000000..d05aee4b
--- /dev/null
+++ b/tests/Assets/Decorator.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets;
+
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
+
+class Decorator extends EntityManagerDecorator
+{
+}
diff --git a/tests/Assets/Entity/Foo.php b/tests/Assets/Entity/Foo.php
new file mode 100644
index 00000000..eb4ada62
--- /dev/null
+++ b/tests/Assets/Entity/Foo.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Entity;
+
+class Foo
+{
+    private $id;
+
+    private $name;
+}
diff --git a/tests/Assets/Extensions/ExtensionMock.php b/tests/Assets/Extensions/ExtensionMock.php
new file mode 100644
index 00000000..e09e849f
--- /dev/null
+++ b/tests/Assets/Extensions/ExtensionMock.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Extensions;
+
+use Doctrine\Common\EventManager;
+use Doctrine\ORM\EntityManagerInterface;
+use LaravelDoctrine\ORM\Extensions\Extension;
+use LaravelDoctrineTest\ORM\Feature\Extensions\ExtensionManagerTest;
+
+class ExtensionMock implements Extension
+{
+    public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void
+    {
+        // Confirm it gets called
+        (new ExtensionManagerTest)->assertTrue(true);
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getFilters(): array
+    {
+        return [];
+    }
+}
diff --git a/tests/Assets/Extensions/ExtensionMock2.php b/tests/Assets/Extensions/ExtensionMock2.php
new file mode 100644
index 00000000..b4c7c636
--- /dev/null
+++ b/tests/Assets/Extensions/ExtensionMock2.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Extensions;
+
+use Doctrine\Common\EventManager;
+use Doctrine\ORM\EntityManagerInterface;
+use LaravelDoctrine\ORM\Extensions\Extension;
+
+class ExtensionMock2 implements Extension
+{
+    public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void
+    {
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getFilters(): array
+    {
+        return [];
+    }
+}
diff --git a/tests/Assets/Extensions/ExtensionWithFiltersMock.php b/tests/Assets/Extensions/ExtensionWithFiltersMock.php
new file mode 100644
index 00000000..0ea1cab5
--- /dev/null
+++ b/tests/Assets/Extensions/ExtensionWithFiltersMock.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Extensions;
+
+use Doctrine\Common\EventManager;
+use Doctrine\ORM\EntityManagerInterface;
+use LaravelDoctrine\ORM\Extensions\Extension;
+
+class ExtensionWithFiltersMock implements Extension
+{
+    public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void
+    {
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getFilters(): array
+    {
+        return [
+            'filter'  => 'FilterMock',
+            'filter2' => 'FilterMock'
+        ];
+    }
+}
diff --git a/tests/Assets/FakeConnection.php b/tests/Assets/FakeConnection.php
new file mode 100644
index 00000000..504b72ad
--- /dev/null
+++ b/tests/Assets/FakeConnection.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets;
+
+use Doctrine\DBAL\Connection;
+
+class FakeConnection extends Connection
+{
+}
diff --git a/tests/Assets/FakeEventManager.php b/tests/Assets/FakeEventManager.php
new file mode 100644
index 00000000..b7fa21e8
--- /dev/null
+++ b/tests/Assets/FakeEventManager.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets;
+
+class FakeEventManager extends \Doctrine\Common\EventManager
+{
+}
diff --git a/tests/Assets/FilterStub.php b/tests/Assets/FilterStub.php
new file mode 100644
index 00000000..82a5e8a0
--- /dev/null
+++ b/tests/Assets/FilterStub.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets;
+
+class FilterStub extends \Doctrine\ORM\Query\Filter\SQLFilter
+{
+    public function addFilterConstraint(\Doctrine\ORM\Mapping\ClassMetadata $targetEntity, string $targetTableAlias): string
+    {
+        return '';
+    }
+}
diff --git a/tests/Assets/ListenerStub.php b/tests/Assets/ListenerStub.php
new file mode 100644
index 00000000..911cbe5f
--- /dev/null
+++ b/tests/Assets/ListenerStub.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets;
+
+class ListenerStub
+{
+}
diff --git a/tests/Assets/Middleware/BindableEntity.php b/tests/Assets/Middleware/BindableEntity.php
new file mode 100644
index 00000000..9298ceae
--- /dev/null
+++ b/tests/Assets/Middleware/BindableEntity.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Middleware;
+
+class BindableEntity
+{
+    public $id;
+
+    public $name;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getName()
+    {
+        return strtolower($this->name);
+    }
+}
diff --git a/tests/Assets/Middleware/BindableEntityWithInterface.php b/tests/Assets/Middleware/BindableEntityWithInterface.php
new file mode 100644
index 00000000..97f4fab5
--- /dev/null
+++ b/tests/Assets/Middleware/BindableEntityWithInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Middleware;
+
+class BindableEntityWithInterface implements \LaravelDoctrine\ORM\Contracts\UrlRoutable
+{
+    public $id;
+
+    public $name;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getName()
+    {
+        return strtolower($this->name);
+    }
+
+    public static function getRouteKeyNameStatic(): string
+    {
+        return 'name';
+    }
+}
diff --git a/tests/Assets/Middleware/EntityController.php b/tests/Assets/Middleware/EntityController.php
new file mode 100644
index 00000000..768e14e7
--- /dev/null
+++ b/tests/Assets/Middleware/EntityController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Middleware;
+
+use Illuminate\Http\Request;
+
+class EntityController
+{
+    public function index(BindableEntity $entity)
+    {
+        return $entity->getName();
+    }
+
+    public function interfacer(BindableEntityWithInterface $entity)
+    {
+        return $entity->getId();
+    }
+
+    public function returnValue(string $value)
+    {
+        return $value;
+    }
+
+    public function returnEntity(BindableEntity $entity = null) {
+        return $entity;
+    }
+
+    public function returnEntityName(BindableEntity $entity) {
+        return $entity->getName();
+    }
+
+    public function checkRequest(Request $request) {
+        return $request instanceof Request ? 'request' : 'something else';
+    }
+}
diff --git a/tests/Assets/Mock/CountableEntityMock.php b/tests/Assets/Mock/CountableEntityMock.php
new file mode 100644
index 00000000..c5bb1ad0
--- /dev/null
+++ b/tests/Assets/Mock/CountableEntityMock.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Mock;
+
+class CountableEntityMock
+{
+}
diff --git a/tests/Assets/Notifications/CustomNotifiableStub.php b/tests/Assets/Notifications/CustomNotifiableStub.php
new file mode 100644
index 00000000..b451c0a1
--- /dev/null
+++ b/tests/Assets/Notifications/CustomNotifiableStub.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Notifications;
+
+use LaravelDoctrine\ORM\Notifications\Notifiable;
+
+class CustomNotifiableStub
+{
+    use Notifiable;
+
+    public function routeNotificationForDoctrine()
+    {
+        return 'custom';
+    }
+}
diff --git a/tests/Assets/Notifications/NotifiableStub.php b/tests/Assets/Notifications/NotifiableStub.php
new file mode 100644
index 00000000..49e8c0d4
--- /dev/null
+++ b/tests/Assets/Notifications/NotifiableStub.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Notifications;
+
+use LaravelDoctrine\ORM\Notifications\Notifiable;
+
+class NotifiableStub
+{
+    use Notifiable;
+}
+
diff --git a/tests/Assets/Notifications/NotificationDatabaseStub.php b/tests/Assets/Notifications/NotificationDatabaseStub.php
new file mode 100644
index 00000000..958a9c68
--- /dev/null
+++ b/tests/Assets/Notifications/NotificationDatabaseStub.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Notifications;
+
+class NotificationDatabaseStub extends \Illuminate\Notifications\Notification
+{
+    public function toDatabase()
+    {
+        return (new \LaravelDoctrine\ORM\Notifications\Notification());
+    }
+}
diff --git a/tests/Assets/Notifications/NotificationInvalidStub.php b/tests/Assets/Notifications/NotificationInvalidStub.php
new file mode 100644
index 00000000..73e35380
--- /dev/null
+++ b/tests/Assets/Notifications/NotificationInvalidStub.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Notifications;
+
+class NotificationInvalidStub extends \Illuminate\Notifications\Notification
+{
+}
diff --git a/tests/Assets/Notifications/NotificationStub.php b/tests/Assets/Notifications/NotificationStub.php
new file mode 100644
index 00000000..76d198f3
--- /dev/null
+++ b/tests/Assets/Notifications/NotificationStub.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Notifications;
+
+class NotificationStub extends \Illuminate\Notifications\Notification
+{
+    public function toEntity()
+    {
+        return (new \LaravelDoctrine\ORM\Notifications\Notification());
+    }
+}
diff --git a/tests/Assets/SubscriberStub.php b/tests/Assets/SubscriberStub.php
new file mode 100644
index 00000000..c208e43f
--- /dev/null
+++ b/tests/Assets/SubscriberStub.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets;
+
+use Doctrine\Common\EventSubscriber;
+
+class SubscriberStub implements EventSubscriber
+{
+    /**
+     * Returns an array of events this subscriber wants to listen to.
+     * @return array
+     */
+    public function getSubscribedEvents()
+    {
+        return [
+            'onFlush'
+        ];
+    }
+}
diff --git a/tests/Assets/Testing/AncestorHydrateableClass.php b/tests/Assets/Testing/AncestorHydrateableClass.php
new file mode 100644
index 00000000..dc7c2b0b
--- /dev/null
+++ b/tests/Assets/Testing/AncestorHydrateableClass.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Testing;
+
+class AncestorHydrateableClass
+{
+    private $name;
+
+    public function getName()
+    {
+        return $this->name;
+    }
+}
diff --git a/tests/Assets/Testing/ChildHydrateableClass.php b/tests/Assets/Testing/ChildHydrateableClass.php
new file mode 100644
index 00000000..0366d621
--- /dev/null
+++ b/tests/Assets/Testing/ChildHydrateableClass.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LaravelDoctrineTest\ORM\Assets\Testing;
+
+class ChildHydrateableClass extends AncestorHydrateableClass
+{
+    private $description;
+
+    public function getDescription()
+    {
+        return $this->description;
+    }
+}
diff --git a/tests/Feature/Auth/DoctrineUserProviderTest.php b/tests/Feature/Auth/DoctrineUserProviderTest.php
index c8841a70..ffda1daa 100644
--- a/tests/Feature/Auth/DoctrineUserProviderTest.php
+++ b/tests/Feature/Auth/DoctrineUserProviderTest.php
@@ -1,11 +1,13 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Auth;
+
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Hashing\Hasher;
-use LaravelDoctrine\ORM\Auth\Authenticatable;
 use LaravelDoctrine\ORM\Auth\DoctrineUserProvider;
+use LaravelDoctrineTest\ORM\Assets\Auth\AuthenticableMock;
+use LaravelDoctrineTest\ORM\Assets\Auth\AuthenticableWithNonEmptyConstructorMock;
 use Mockery as m;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
@@ -168,7 +170,7 @@ public function test_rehash_password_if_required_rehash_force()
 
     public function test_rehash_password_if_required_rehash_norehash_needed()
     {
-        $user = new AuthenticableMock;
+        $user = new AuthenticableMock();
         $user->setPassword('originalPassword');
 
         $this->hasher->shouldReceive('needsRehash')->once()->andReturn(false);
@@ -189,23 +191,3 @@ protected function tearDown(): void
         m::close();
     }
 }
-
-class AuthenticableMock implements AuthenticatableContract
-{
-    use Authenticatable;
-
-    public function __construct()
-    {
-        $this->password = 'myPassword';
-    }
-}
-
-class AuthenticableWithNonEmptyConstructorMock implements AuthenticatableContract
-{
-    use Authenticatable;
-
-    public function __construct(array $passwords)
-    {
-        $this->password = $passwords[0];
-    }
-}
diff --git a/tests/Feature/Auth/Passwords/DoctrineTokenRepositoryTest.php b/tests/Feature/Auth/Passwords/DoctrineTokenRepositoryTest.php
index 3d32fd89..b59bd44b 100644
--- a/tests/Feature/Auth/Passwords/DoctrineTokenRepositoryTest.php
+++ b/tests/Feature/Auth/Passwords/DoctrineTokenRepositoryTest.php
@@ -1,12 +1,14 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Auth\Passwords;
+
 use Carbon\Carbon;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Illuminate\Contracts\Auth\CanResetPassword;
 use Illuminate\Contracts\Hashing\Hasher;
 use LaravelDoctrine\ORM\Auth\Passwords\DoctrineTokenRepository;
+use LaravelDoctrineTest\ORM\Assets\Auth\Passwords\UserMock;
 use Mockery as m;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
@@ -236,7 +238,7 @@ public function test_can_delete()
                       ->once()
                       ->andReturn(true);
 
-        $this->repository->delete(new UserMock);
+        $this->repository->delete(new UserMock());
 
         $this->assertTrue(true);
     }
@@ -274,26 +276,3 @@ protected function tearDown(): void
         m::close();
     }
 }
-
-class UserMock implements CanResetPassword
-{
-    /**
-     * Get the e-mail address where password reset links are sent.
-     * @return string
-     */
-    public function getEmailForPasswordReset()
-    {
-        return 'user@mockery.mock';
-    }
-
-    /**
-     * Send the password reset notification.
-     *
-     * @param  string $token
-     * @return void
-     */
-    public function sendPasswordResetNotification($token)
-    {
-        // TODO: Implement sendPasswordResetNotification() method.
-    }
-}
diff --git a/tests/Feature/Configuration/Cache/AbstractCacheProviderTest.php b/tests/Feature/Configuration/Cache/AbstractCacheProviderTest.php
index 91d58929..3b608496 100644
--- a/tests/Feature/Configuration/Cache/AbstractCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/AbstractCacheProviderTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
+use Mockery;
 use PHPUnit\Framework\TestCase;
 
 abstract class AbstractCacheProviderTest extends TestCase
diff --git a/tests/Feature/Configuration/Cache/ApcCacheProviderTest.php b/tests/Feature/Configuration/Cache/ApcCacheProviderTest.php
index 3ae8ef7b..2e9e1564 100644
--- a/tests/Feature/Configuration/Cache/ApcCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/ApcCacheProviderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
 use Illuminate\Contracts\Cache\Factory;
 use Illuminate\Contracts\Cache\Repository;
 use LaravelDoctrine\ORM\Configuration\Cache\ApcCacheProvider;
diff --git a/tests/Feature/Configuration/Cache/ArrayCacheProviderTest.php b/tests/Feature/Configuration/Cache/ArrayCacheProviderTest.php
index af0cc6a6..160863b0 100644
--- a/tests/Feature/Configuration/Cache/ArrayCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/ArrayCacheProviderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
 use LaravelDoctrine\ORM\Configuration\Cache\ArrayCacheProvider;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
diff --git a/tests/Feature/Configuration/Cache/CacheManagerTest.php b/tests/Feature/Configuration/Cache/CacheManagerTest.php
index ca93989a..e8fcb24a 100644
--- a/tests/Feature/Configuration/Cache/CacheManagerTest.php
+++ b/tests/Feature/Configuration/Cache/CacheManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Foundation\Application;
diff --git a/tests/Feature/Configuration/Cache/FileCacheProviderTest.php b/tests/Feature/Configuration/Cache/FileCacheProviderTest.php
index 32adb5a4..842e8259 100644
--- a/tests/Feature/Configuration/Cache/FileCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/FileCacheProviderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Cache\FileCacheProvider;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/Cache/IlluminateCacheProviderTest.php b/tests/Feature/Configuration/Cache/IlluminateCacheProviderTest.php
index 5b9faff7..979fdce2 100644
--- a/tests/Feature/Configuration/Cache/IlluminateCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/IlluminateCacheProviderTest.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace Configuration\Cache;
+//namespace Configuration\Cache;
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
 
 use Illuminate\Contracts\Cache\Factory;
 use Illuminate\Contracts\Cache\Repository;
diff --git a/tests/Feature/Configuration/Cache/MemcachedCacheProviderTest.php b/tests/Feature/Configuration/Cache/MemcachedCacheProviderTest.php
index 65aefa17..eab79ed3 100644
--- a/tests/Feature/Configuration/Cache/MemcachedCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/MemcachedCacheProviderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
 use Illuminate\Contracts\Cache\Factory;
 use Illuminate\Contracts\Cache\Repository;
 use LaravelDoctrine\ORM\Configuration\Cache\MemcachedCacheProvider;
diff --git a/tests/Feature/Configuration/Cache/PhpFileCacheProviderTest.php b/tests/Feature/Configuration/Cache/PhpFileCacheProviderTest.php
index 27b7f12a..8dccde6f 100644
--- a/tests/Feature/Configuration/Cache/PhpFileCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/PhpFileCacheProviderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Cache\PhpFileCacheProvider;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/Cache/RedisCacheProviderTest.php b/tests/Feature/Configuration/Cache/RedisCacheProviderTest.php
index 1bf82637..56a8deee 100644
--- a/tests/Feature/Configuration/Cache/RedisCacheProviderTest.php
+++ b/tests/Feature/Configuration/Cache/RedisCacheProviderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Cache;
+
 use Illuminate\Contracts\Cache\Factory;
 use Illuminate\Contracts\Cache\Repository;
 use LaravelDoctrine\ORM\Configuration\Cache\RedisCacheProvider;
diff --git a/tests/Feature/Configuration/Connections/ConnectionManagerTest.php b/tests/Feature/Configuration/Connections/ConnectionManagerTest.php
index a4ff19d9..57e243c5 100644
--- a/tests/Feature/Configuration/Connections/ConnectionManagerTest.php
+++ b/tests/Feature/Configuration/Connections/ConnectionManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Connections;
+
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\ORM\Configuration\Connections\ConnectionManager;
diff --git a/tests/Feature/Configuration/Connections/MysqlConnectionTest.php b/tests/Feature/Configuration/Connections/MysqlConnectionTest.php
index 5d377fee..1d652e22 100644
--- a/tests/Feature/Configuration/Connections/MysqlConnectionTest.php
+++ b/tests/Feature/Configuration/Connections/MysqlConnectionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Connections;
+
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Connections\MysqlConnection;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/Connections/OracleConnectionTest.php b/tests/Feature/Configuration/Connections/OracleConnectionTest.php
index 623f6fae..2bf9d124 100644
--- a/tests/Feature/Configuration/Connections/OracleConnectionTest.php
+++ b/tests/Feature/Configuration/Connections/OracleConnectionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Connections;
+
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Connections\OracleConnection;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/Connections/PgsqlConnectionTest.php b/tests/Feature/Configuration/Connections/PgsqlConnectionTest.php
index 883682d9..3634c7fd 100644
--- a/tests/Feature/Configuration/Connections/PgsqlConnectionTest.php
+++ b/tests/Feature/Configuration/Connections/PgsqlConnectionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Connections;
+
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Connections\PgsqlConnection;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/Connections/PrimaryReadReplicaConnectionTest.php b/tests/Feature/Configuration/Connections/PrimaryReadReplicaConnectionTest.php
index 23379a98..f8f6cf5c 100644
--- a/tests/Feature/Configuration/Connections/PrimaryReadReplicaConnectionTest.php
+++ b/tests/Feature/Configuration/Connections/PrimaryReadReplicaConnectionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Connections;
+
 use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection as PrimaryReadReplicaDoctrineWrapper;
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Connections\PrimaryReadReplicaConnection;
diff --git a/tests/Feature/Configuration/Connections/SqliteConnectionTest.php b/tests/Feature/Configuration/Connections/SqliteConnectionTest.php
index eb62c044..9ac18210 100644
--- a/tests/Feature/Configuration/Connections/SqliteConnectionTest.php
+++ b/tests/Feature/Configuration/Connections/SqliteConnectionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Connections;
+
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Connections\SqliteConnection;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/Connections/SqlsrvConnectionTest.php b/tests/Feature/Configuration/Connections/SqlsrvConnectionTest.php
index 16eb9f8c..a0948ab3 100644
--- a/tests/Feature/Configuration/Connections/SqlsrvConnectionTest.php
+++ b/tests/Feature/Configuration/Connections/SqlsrvConnectionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\Connections;
+
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Connections\SqlsrvConnection;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/CustomTypeManagerTest.php b/tests/Feature/Configuration/CustomTypeManagerTest.php
index 5f7370d9..e8832e61 100644
--- a/tests/Feature/Configuration/CustomTypeManagerTest.php
+++ b/tests/Feature/Configuration/CustomTypeManagerTest.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration;
+
 use Doctrine\DBAL\Exception as DBALException;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Type;
 use LaravelDoctrine\ORM\Configuration\CustomTypeManager;
+use LaravelDoctrineTest\ORM\Assets\Configuration\TypeMock;
+use LaravelDoctrineTest\ORM\Assets\Configuration\TypeMock2;
 use PHPUnit\Framework\TestCase;
 
 class CustomTypeManagerTest extends TestCase
@@ -49,26 +51,3 @@ public function test_cannot_get_non_existing_type()
         $manager->getType('non_existing');
     }
 }
-
-class TypeMock extends Type
-{
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return '';
-    }
-
-    public function getName()
-    {
-    }
-}
-class TypeMock2 extends Type
-{
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return '';
-    }
-
-    public function getName()
-    {
-    }
-}
diff --git a/tests/Feature/Configuration/LaravelNamingStategyTest.php b/tests/Feature/Configuration/LaravelNamingStrategyTest.php
similarity index 98%
rename from tests/Feature/Configuration/LaravelNamingStategyTest.php
rename to tests/Feature/Configuration/LaravelNamingStrategyTest.php
index b145b8ca..e9f63a8d 100644
--- a/tests/Feature/Configuration/LaravelNamingStategyTest.php
+++ b/tests/Feature/Configuration/LaravelNamingStrategyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration;
+
 use Illuminate\Support\Str;
 use LaravelDoctrine\ORM\Configuration\LaravelNamingStrategy;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Feature/Configuration/MetaData/AttributesTest.php b/tests/Feature/Configuration/MetaData/AttributesTest.php
index 3db054c7..af0e6765 100644
--- a/tests/Feature/Configuration/MetaData/AttributesTest.php
+++ b/tests/Feature/Configuration/MetaData/AttributesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\MetaData;
+
 use LaravelDoctrine\ORM\Configuration\MetaData\Attributes;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Mockery as m;
diff --git a/tests/Feature/Configuration/MetaData/MetaDataManagerTest.php b/tests/Feature/Configuration/MetaData/MetaDataManagerTest.php
index a1fdd920..d3f7d396 100644
--- a/tests/Feature/Configuration/MetaData/MetaDataManagerTest.php
+++ b/tests/Feature/Configuration/MetaData/MetaDataManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\MetaData;
+
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\ORM\Configuration\MetaData\MetaDataManager;
diff --git a/tests/Feature/Configuration/MetaData/PhpTest.php b/tests/Feature/Configuration/MetaData/PhpTest.php
index 48a16436..f11f6222 100644
--- a/tests/Feature/Configuration/MetaData/PhpTest.php
+++ b/tests/Feature/Configuration/MetaData/PhpTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\MetaData;
+
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Persistence\Mapping\Driver\PHPDriver;
 use LaravelDoctrine\ORM\Configuration\MetaData\Php;
diff --git a/tests/Feature/Configuration/MetaData/SimplifiedXmlTest.php b/tests/Feature/Configuration/MetaData/SimplifiedXmlTest.php
index dc8f58f1..e9571aa5 100644
--- a/tests/Feature/Configuration/MetaData/SimplifiedXmlTest.php
+++ b/tests/Feature/Configuration/MetaData/SimplifiedXmlTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\MetaData;
+
 use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use LaravelDoctrine\ORM\Configuration\MetaData\SimplifiedXml;
diff --git a/tests/Feature/Configuration/MetaData/StaticPhpTest.php b/tests/Feature/Configuration/MetaData/StaticPhpTest.php
index 5d7a2cf2..6ff7ce71 100644
--- a/tests/Feature/Configuration/MetaData/StaticPhpTest.php
+++ b/tests/Feature/Configuration/MetaData/StaticPhpTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\MetaData;
+
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Persistence\Mapping\Driver\StaticPHPDriver;
 use LaravelDoctrine\ORM\Configuration\MetaData\StaticPhp;
diff --git a/tests/Feature/Configuration/MetaData/XmlTest.php b/tests/Feature/Configuration/MetaData/XmlTest.php
index b68917a8..2991ba5e 100644
--- a/tests/Feature/Configuration/MetaData/XmlTest.php
+++ b/tests/Feature/Configuration/MetaData/XmlTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Configuration\MetaData;
+
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use LaravelDoctrine\ORM\Configuration\MetaData\Xml;
diff --git a/tests/Feature/DoctrineManagerTest.php b/tests/Feature/DoctrineManagerTest.php
index ffae4f1a..fef62bc6 100644
--- a/tests/Feature/DoctrineManagerTest.php
+++ b/tests/Feature/DoctrineManagerTest.php
@@ -1,11 +1,14 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature;
+
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Illuminate\Contracts\Container\Container;
+use InvalidArgumentException;
 use LaravelDoctrine\ORM\BootChain;
 use LaravelDoctrine\ORM\DoctrineExtender;
 use LaravelDoctrine\ORM\DoctrineManager;
diff --git a/tests/Feature/EntityManagerFactoryTest.php b/tests/Feature/EntityManagerFactoryTest.php
index 83628d17..3f11cdc9 100644
--- a/tests/Feature/EntityManagerFactoryTest.php
+++ b/tests/Feature/EntityManagerFactoryTest.php
@@ -1,12 +1,12 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature;
+
 use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\ORM\Cache\CacheFactory;
-use Doctrine\ORM\Cache\RegionsConfiguration;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\Decorator\EntityManagerDecorator;
 use Doctrine\ORM\EntityManagerInterface;
@@ -15,6 +15,7 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Container\Container;
+use InvalidArgumentException;
 use LaravelDoctrine\ORM\Configuration\Cache\CacheManager;
 use LaravelDoctrine\ORM\Configuration\Connections\ConnectionManager;
 use LaravelDoctrine\ORM\Configuration\LaravelNamingStrategy;
@@ -24,10 +25,19 @@
 use LaravelDoctrine\ORM\Resolvers\EntityListenerResolver;
 use LaravelDoctrine\ORM\ORMSetupResolver;
 use LaravelDoctrine\ORM\Testing\ConfigRepository;
+use LaravelDoctrineTest\ORM\Assets\AnotherListenerStub;
+use LaravelDoctrineTest\ORM\Assets\Decorator;
+use LaravelDoctrineTest\ORM\Assets\FakeConnection;
+use LaravelDoctrineTest\ORM\Assets\FakeEventManager;
+use LaravelDoctrineTest\ORM\Assets\FilterStub;
+use LaravelDoctrineTest\ORM\Assets\ListenerStub;
+use LaravelDoctrineTest\ORM\Assets\SubscriberStub;
 use Mockery as m;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemPoolInterface;
+use ReflectionException;
+use ReflectionObject;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
 class EntityManagerFactoryTest extends TestCase
@@ -526,12 +536,12 @@ public function test_illuminate_cache_provider_custom_store()
             return $config;
         });
 
-        $cache = M::mock(Illuminate\Contracts\Cache\Repository::class);
+        $cache = M::mock(\Illuminate\Contracts\Cache\Repository::class);
 
         $factory = M::mock(\Illuminate\Contracts\Cache\Factory::class);
         $factory->shouldReceive('store')->with('myStoreName')->andReturn($cache);
 
-        $container->singleton(Illuminate\Contracts\Cache\Factory::class, function () use ($factory) {
+        $container->singleton(\Illuminate\Contracts\Cache\Factory::class, function () use ($factory) {
             return $factory;
         });
 
@@ -584,12 +594,12 @@ public function test_illuminate_cache_provider_redis()
             return $config;
         });
 
-        $cache = M::mock(Illuminate\Contracts\Cache\Repository::class);
+        $cache = M::mock(\Illuminate\Contracts\Cache\Repository::class);
 
         $factory = M::mock(\Illuminate\Contracts\Cache\Factory::class);
         $factory->shouldReceive('store')->with('redis')->andReturn($cache);
 
-        $container->singleton(Illuminate\Contracts\Cache\Factory::class, function () use ($factory) {
+        $container->singleton(\Illuminate\Contracts\Cache\Factory::class, function () use ($factory) {
             return $factory;
         });
 
@@ -642,12 +652,12 @@ public function test_illuminate_cache_provider_invalid_store()
             return $config;
         });
 
-        $cache = M::mock(Illuminate\Contracts\Cache\Repository::class);
+        $cache = M::mock(\Illuminate\Contracts\Cache\Repository::class);
 
         $factory = M::mock(\Illuminate\Contracts\Cache\Factory::class);
         $factory->shouldReceive('store')->with('myStoreName')->andReturn($cache);
 
-        $container->singleton(Illuminate\Contracts\Cache\Factory::class, function () use ($factory) {
+        $container->singleton(\Illuminate\Contracts\Cache\Factory::class, function () use ($factory) {
             return $factory;
         });
 
@@ -1208,45 +1218,3 @@ private function getDummyBaseInputConfig()
         ];
     }
 }
-
-class FakeEventManager extends \Doctrine\Common\EventManager
-{
-}
-
-class FakeConnection extends Connection
-{
-}
-
-class FilterStub extends \Doctrine\ORM\Query\Filter\SQLFilter
-{
-    public function addFilterConstraint(\Doctrine\ORM\Mapping\ClassMetadata $targetEntity, string $targetTableAlias): string
-    {
-        return '';
-    }
-}
-
-class ListenerStub
-{
-}
-
-class AnotherListenerStub
-{
-}
-
-class SubscriberStub implements EventSubscriber
-{
-    /**
-     * Returns an array of events this subscriber wants to listen to.
-     * @return array
-     */
-    public function getSubscribedEvents()
-    {
-        return [
-            'onFlush'
-        ];
-    }
-}
-
-class Decorator extends EntityManagerDecorator
-{
-}
diff --git a/tests/Feature/Extensions/ExtensionManagerTest.php b/tests/Feature/Extensions/ExtensionManagerTest.php
index 49fc433e..5b2cfeeb 100644
--- a/tests/Feature/Extensions/ExtensionManagerTest.php
+++ b/tests/Feature/Extensions/ExtensionManagerTest.php
@@ -1,13 +1,18 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Extensions;
+
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\ORM\Query\FilterCollection;
 use Doctrine\Persistence\ManagerRegistry;
 use Illuminate\Contracts\Container\Container;
-use LaravelDoctrine\ORM\Extensions\Extension;
 use LaravelDoctrine\ORM\Extensions\ExtensionManager;
+use LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock;
+use LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock2;
+use LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionWithFiltersMock;
 use Mockery as m;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
@@ -44,11 +49,6 @@ class ExtensionManagerTest extends TestCase
      */
     protected $driver;
 
-    /**
-     * @var Mock
-     */
-    protected $reader;
-
     /**
      * @var Container|Mock
      */
@@ -61,8 +61,7 @@ protected function setUp(): void
         $this->em            = m::mock(EntityManagerInterface::class);
         $this->evm           = m::mock(EventManager::class);
         $this->configuration = m::mock(Configuration::class);
-        $this->driver        = m::mock(\Doctrine\ORM\Mapping\Driver\XmlDriver::class);
-        $this->reader        = m::mock(Reader::class);
+        $this->driver        = m::mock(XmlDriver::class);
 
         $this->manager = $this->newManager();
     }
@@ -93,7 +92,7 @@ public function test_boot_manager_with_one_manager_and_one_extension()
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
-        $this->assertTrue($booted['default']['ExtensionMock']);
+        $this->assertTrue((bool) $booted['default']['LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock']);
     }
 
     public function test_boot_manager_with_two_managers_and_one_extension()
@@ -114,8 +113,8 @@ public function test_boot_manager_with_two_managers_and_one_extension()
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
-        $this->assertTrue($booted['default']['ExtensionMock']);
-        $this->assertTrue($booted['custom']['ExtensionMock']);
+        $this->assertTrue((bool) $booted['default']['LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock']);
+        $this->assertTrue((bool) $booted['custom']['LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock']);
     }
 
     public function test_boot_manager_with_one_manager_and_two_extensions()
@@ -138,8 +137,8 @@ public function test_boot_manager_with_one_manager_and_two_extensions()
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
-        $this->assertTrue($booted['default']['ExtensionMock']);
-        $this->assertTrue($booted['default']['ExtensionMock2']);
+        $this->assertTrue((bool) $booted['default']['LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock']);
+        $this->assertTrue((bool) $booted['default']['LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock2']);
     }
 
     public function test_extension_will_only_be_booted_once()
@@ -161,7 +160,7 @@ public function test_extension_will_only_be_booted_once()
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
-        $this->assertTrue($booted['default']['ExtensionMock']);
+        $this->assertTrue((bool) $booted['default']['LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionMock']);
     }
 
     public function test_filters_get_registered_on_boot()
@@ -191,7 +190,8 @@ public function test_filters_get_registered_on_boot()
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
-        $this->assertTrue($booted['default']['ExtensionWithFiltersMock']);
+
+        $this->assertTrue((bool) $booted['default']['LaravelDoctrineTest\ORM\Assets\Extensions\ExtensionWithFiltersMock']);
     }
 
     protected function tearDown(): void
@@ -206,53 +206,3 @@ protected function newManager()
         return new ExtensionManager($this->container);
     }
 }
-
-class ExtensionMock implements Extension
-{
-    public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void
-    {
-        // Confirm it get's called
-        (new ExtensionManagerTest)->assertTrue(true);
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function getFilters(): array
-    {
-        return [];
-    }
-}
-
-class ExtensionMock2 implements Extension
-{
-    public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void
-    {
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function getFilters(): array
-    {
-        return [];
-    }
-}
-
-class ExtensionWithFiltersMock implements Extension
-{
-    public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void
-    {
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function getFilters(): array
-    {
-        return [
-            'filter'  => 'FilterMock',
-            'filter2' => 'FilterMock'
-        ];
-    }
-}
diff --git a/tests/Feature/Extensions/MappingDriverChainTest.php b/tests/Feature/Extensions/MappingDriverChainTest.php
index 283688e3..0da97cbe 100644
--- a/tests/Feature/Extensions/MappingDriverChainTest.php
+++ b/tests/Feature/Extensions/MappingDriverChainTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Extensions;
+
 use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\Persistence\Mapping\Driver\DefaultFileLocator;
diff --git a/tests/Feature/IlluminateRegistryTest.php b/tests/Feature/IlluminateRegistryTest.php
index e0df5fd7..37d4829d 100644
--- a/tests/Feature/IlluminateRegistryTest.php
+++ b/tests/Feature/IlluminateRegistryTest.php
@@ -1,13 +1,19 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature;
+
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
+use Exception;
 use Illuminate\Contracts\Container\Container;
+use InvalidArgumentException;
 use LaravelDoctrine\ORM\EntityManagerFactory;
 use LaravelDoctrine\ORM\IlluminateRegistry;
 use Mockery as m;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
+use stdClass;
 
 class IlluminateRegistryTest extends TestCase
 {
diff --git a/tests/Feature/Middleware/SubstituteBindingsTest.php b/tests/Feature/Middleware/SubstituteBindingsTest.php
index ba1ebd2a..4c0a542a 100644
--- a/tests/Feature/Middleware/SubstituteBindingsTest.php
+++ b/tests/Feature/Middleware/SubstituteBindingsTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Middleware;
+
 use Doctrine\ORM\EntityManager;
 use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectRepository;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Routing\Registrar;
 use Illuminate\Events\Dispatcher;
@@ -10,6 +13,8 @@
 use Illuminate\Routing\Contracts\CallableDispatcher as CallableDispatcherContract;
 use Illuminate\Routing\Router;
 use LaravelDoctrine\ORM\Middleware\SubstituteBindings;
+use LaravelDoctrineTest\ORM\Assets\Middleware\BindableEntity;
+use LaravelDoctrineTest\ORM\Assets\Middleware\BindableEntityWithInterface;
 use Mockery as m;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
@@ -35,7 +40,7 @@ public function setUp(): void
     {
         $this->registry     = m::mock(ManagerRegistry::class);
         $this->em           = m::mock(EntityManager::class);
-        $this->repository   = m::mock(\Doctrine\Persistence\ObjectRepository::class);
+        $this->repository   = m::mock(ObjectRepository::class);
     }
 
     protected function getRouter()
@@ -57,7 +62,7 @@ protected function getRouter()
 
     protected function mockRegistry()
     {
-        $this->registry->shouldReceive('getRepository')->once()->with('BindableEntity')->andReturn($this->repository);
+        $this->registry->shouldReceive('getRepository')->once()->with('LaravelDoctrineTest\ORM\Assets\Middleware\BindableEntity')->andReturn($this->repository);
     }
 
     public function test_entity_binding()
@@ -65,7 +70,7 @@ public function test_entity_binding()
         $router = $this->getRouter();
         $router->get('foo/{entity}', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@returnEntityName',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@returnEntityName',
         ]);
 
         $this->mockRegistry();
@@ -85,7 +90,7 @@ public function test_entity_binding_expect_entity_not_found_exception()
 
         $router->get('foo/{entity}', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@returnEntityName',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@returnEntityName',
         ]);
 
         $this->mockRegistry();
@@ -99,7 +104,7 @@ public function test_entity_binding_get_null_entity()
         $router = $this->getRouter();
         $router->get('foo/{entity}', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@returnEntity',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@returnEntity',
         ]);
 
         $this->mockRegistry();
@@ -113,14 +118,14 @@ public function test_binding_value()
         $router = $this->getRouter();
         $router->get('foo/{value}', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@returnValue',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@returnValue',
         ]);
 
         $this->assertEquals(123456, $router->dispatch(Request::create('foo/123456', 'GET'))->getContent());
 
         $router->get('doc/trine', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@checkRequest',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@checkRequest',
         ]);
 
         $this->assertEquals('request', $router->dispatch(Request::create('doc/trine', 'GET'))->getContent());
@@ -130,7 +135,7 @@ public function test_controller_entity_binding()
     {
         $router = $this->getRouter();
         $router->get('foo/{entity}', [
-            'uses'       => 'EntityController@index',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@index',
             'middleware' => SubstituteBindings::class,
         ]);
 
@@ -147,11 +152,11 @@ public function test_not_id_binding()
     {
         $router = $this->getRouter();
         $router->get('foo/{entity}', [
-            'uses'       => 'EntityController@interfacer',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@interfacer',
             'middleware' => SubstituteBindings::class,
         ]);
 
-        $this->registry->shouldReceive('getRepository')->once()->with('BindableEntityWithInterface')->andReturn($this->repository);
+        $this->registry->shouldReceive('getRepository')->once()->with('LaravelDoctrineTest\ORM\Assets\Middleware\BindableEntityWithInterface')->andReturn($this->repository);
         $entity       = new BindableEntityWithInterface();
         $entity->id   = 1;
         $entity->name = 'NAMEVALUE';
@@ -165,7 +170,7 @@ public function test_for_typed_value_binding()
         $router = $this->getRouter();
         $router->get('foo/{value}', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@returnValue',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@returnValue',
         ]);
 
         $this->assertEquals('test', $router->dispatch(Request::create('foo/test', 'GET'))->getContent());
@@ -173,14 +178,14 @@ public function test_for_typed_value_binding()
         $router = $this->getRouter();
         $router->get('bar/{value}', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@returnValue',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@returnValue',
         ]);
 
         $this->assertEquals(123456, $router->dispatch(Request::create('bar/123456', 'GET'))->getContent());
 
         $router->get('doc/trine', [
             'middleware' => SubstituteBindings::class,
-            'uses'       => 'EntityController@checkRequest',
+            'uses'       => 'LaravelDoctrineTest\ORM\Assets\Middleware\EntityController@checkRequest',
         ]);
 
         $this->assertEquals('request', $router->dispatch(Request::create('doc/trine', 'GET'))->getContent());
@@ -191,72 +196,3 @@ protected function tearDown(): void
         m::close();
     }
 }
-
-class BindableEntity
-{
-    public $id;
-
-    public $name;
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function getName()
-    {
-        return strtolower($this->name);
-    }
-}
-
-class BindableEntityWithInterface implements \LaravelDoctrine\ORM\Contracts\UrlRoutable
-{
-    public $id;
-
-    public $name;
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function getName()
-    {
-        return strtolower($this->name);
-    }
-
-    public static function getRouteKeyNameStatic(): string
-    {
-        return 'name';
-    }
-}
-
-class EntityController
-{
-    public function index(BindableEntity $entity)
-    {
-        return $entity->getName();
-    }
-
-    public function interfacer(BindableEntityWithInterface $entity)
-    {
-        return $entity->getId();
-    }
-
-    public function returnValue(string $value)
-    {
-        return $value;
-    }
-
-    public function returnEntity(BindableEntity $entity = null) {
-        return $entity;
-    }
-
-    public function returnEntityName(BindableEntity $entity) {
-        return $entity->getName();
-    }
-
-    public function checkRequest(Request $request) {
-        return $request instanceof Request ? 'request' : 'something else';
-    }
-}
diff --git a/tests/Feature/Notifications/DoctrineChannelTest.php b/tests/Feature/Notifications/DoctrineChannelTest.php
index 86320132..514afd01 100644
--- a/tests/Feature/Notifications/DoctrineChannelTest.php
+++ b/tests/Feature/Notifications/DoctrineChannelTest.php
@@ -1,12 +1,20 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Notifications;
+
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use LaravelDoctrine\ORM\Exceptions\NoEntityManagerFound;
 use LaravelDoctrine\ORM\Notifications\DoctrineChannel;
-use LaravelDoctrine\ORM\Notifications\Notifiable;
+use LaravelDoctrineTest\ORM\Assets\Notifications\CustomNotifiableStub;
+use LaravelDoctrineTest\ORM\Assets\Notifications\NotifiableStub;
+use LaravelDoctrineTest\ORM\Assets\Notifications\NotificationDatabaseStub;
+use LaravelDoctrineTest\ORM\Assets\Notifications\NotificationInvalidStub;
+use LaravelDoctrineTest\ORM\Assets\Notifications\NotificationStub;
+use Mockery;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 
 class DoctrineChannelTest extends TestCase
 {
@@ -90,38 +98,3 @@ public function test_it_should_throw_exception_when_it_does_not_find_an_em()
         $this->channel->send(new CustomNotifiableStub(), new NotificationStub());
     }
 }
-
-class NotificationStub extends \Illuminate\Notifications\Notification
-{
-    public function toEntity()
-    {
-        return (new \LaravelDoctrine\ORM\Notifications\Notification);
-    }
-}
-
-class NotificationDatabaseStub extends \Illuminate\Notifications\Notification
-{
-    public function toDatabase()
-    {
-        return (new \LaravelDoctrine\ORM\Notifications\Notification);
-    }
-}
-
-class NotificationInvalidStub extends \Illuminate\Notifications\Notification
-{
-}
-
-class NotifiableStub
-{
-    use Notifiable;
-}
-
-class CustomNotifiableStub
-{
-    use Notifiable;
-
-    public function routeNotificationForDoctrine()
-    {
-        return 'custom';
-    }
-}
diff --git a/tests/Feature/Notifications/NotificationTest.php b/tests/Feature/Notifications/NotificationTest.php
index b00c11bd..79faca83 100644
--- a/tests/Feature/Notifications/NotificationTest.php
+++ b/tests/Feature/Notifications/NotificationTest.php
@@ -1,8 +1,14 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Notifications;
+
 use Doctrine\ORM\EntityManagerInterface;
+use LaravelDoctrine\ORM\Notifications\Notification;
+use Mockery;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use stdClass;
 
 class NotificationTest extends TestCase
 {
@@ -23,7 +29,7 @@ public function setUp(): void
 
     public function testClassFunctions()
     {
-        $entity = new \LaravelDoctrine\ORM\Notifications\Notification();
+        $entity = new Notification();
 
         $entity->success();
         $this->assertEquals('success', $entity->getLevel());
diff --git a/tests/Feature/Pagination/PaginatorAdapterTest.php b/tests/Feature/Pagination/PaginatorAdapterTest.php
index 2fa21ae2..112f728b 100644
--- a/tests/Feature/Pagination/PaginatorAdapterTest.php
+++ b/tests/Feature/Pagination/PaginatorAdapterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Pagination;
+
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Types;
@@ -12,14 +14,16 @@
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\AbstractPaginator;
 use LaravelDoctrine\ORM\Pagination\PaginatorAdapter;
+use Mockery;
 use PHPUnit\Framework\TestCase;
+use stdClass;
 
 class PaginatorAdapterTest extends TestCase
 {
     public function testMakesLaravelsPaginatorFromParams()
     {
         $em      = $this->mockEntityManager();
-        $query   = (new Query($em))->setDQL('SELECT f FROM Foo f');
+        $query   = (new Query($em))->setDQL('SELECT f FROM LaravelDoctrineTest\ORM\Assets\Entity\Foo f');
         $adapter = PaginatorAdapter::fromParams($query, 15, 2);
 
         $paginator = $adapter->make();
@@ -35,7 +39,7 @@ public function testMakesLaravelsPaginatorFromRequest()
         });
 
         $em      = $this->mockEntityManager();
-        $query   = (new Query($em))->setDQL('SELECT f FROM Foo f');
+        $query   = (new Query($em))->setDQL('SELECT f FROM LaravelDoctrineTest\ORM\Assets\Entity\Foo f');
         $adapter = PaginatorAdapter::fromRequest($query);
 
         $paginator = $adapter->make();
@@ -47,7 +51,7 @@ public function testMakesLaravelsPaginatorFromRequest()
     public function testQueryParametersAreProducedInUrlFromParams()
     {
         $em      = $this->mockEntityManager();
-        $query   = (new Query($em))->setDQL('SELECT f FROM Foo f');
+        $query   = (new Query($em))->setDQL('SELECT f FROM LaravelDoctrineTest\ORM\Assets\Entity\Foo f');
         $adapter = PaginatorAdapter::fromParams($query, 15, 2, false)
             ->queryParams(['foo' => 'bar']);
 
@@ -61,7 +65,7 @@ public function testQueryParametersAreProducedInUrlFromParams()
     public function testQueryParametersAreProducedInUrlFromRequest()
     {
         $em      = $this->mockEntityManager();
-        $query   = (new Query($em))->setDQL('SELECT f FROM Foo f');
+        $query   = (new Query($em))->setDQL('SELECT f FROM LaravelDoctrineTest\ORM\Assets\Entity\Foo f');
         $adapter = PaginatorAdapter::fromRequest($query)
             ->queryParams(['foo' => 'bar']);
 
@@ -76,12 +80,12 @@ public function testQueryParametersAreProducedInUrlFromRequest()
     private function mockEntityManager()
     {
         /** @var EntityManagerInterface|\Mockery\Mock $em */
-        $em         = \Mockery::mock(EntityManagerInterface::class);
-        $config     = \Mockery::mock(Configuration::class);
-        $metadata   = \Mockery::mock(ClassMetadata::class);
-        $connection = \Mockery::mock(Connection::class);
-        $platform   = \Mockery::mock(AbstractPlatform::class);
-        $hydrator   = \Mockery::mock(AbstractHydrator::class);
+        $em         = Mockery::mock(EntityManagerInterface::class);
+        $config     = Mockery::mock(Configuration::class);
+        $metadata   = Mockery::mock(ClassMetadata::class);
+        $connection = Mockery::mock(Connection::class);
+        $platform   = Mockery::mock(AbstractPlatform::class);
+        $hydrator   = Mockery::mock(AbstractHydrator::class);
 
         $config->shouldReceive('getDefaultQueryHints')->andReturn([]);
         $config->shouldReceive('isSecondLevelCacheEnabled')->andReturn(false);
@@ -143,7 +147,7 @@ private function mockEntityManager()
         $hydrator->shouldReceive('hydrateAll')->andReturn([]);
 
         $em->shouldReceive('getConfiguration')->andReturn($config);
-        $em->shouldReceive('getClassMetadata')->with('Foo')->andReturn($metadata);
+        $em->shouldReceive('getClassMetadata')->with('LaravelDoctrineTest\ORM\Assets\Entity\Foo')->andReturn($metadata);
         $em->shouldReceive('getConnection')->andReturn($connection);
         $em->shouldReceive('hasFilters')->andReturn(false);
         $em->shouldReceive('newHydrator')->andReturn($hydrator);
@@ -151,10 +155,3 @@ private function mockEntityManager()
         return $em;
     }
 }
-
-class Foo
-{
-    private $id;
-
-    private $name;
-}
diff --git a/tests/Feature/Resolvers/EntityListenerResolverTest.php b/tests/Feature/Resolvers/EntityListenerResolverTest.php
index 676734e9..40f183db 100644
--- a/tests/Feature/Resolvers/EntityListenerResolverTest.php
+++ b/tests/Feature/Resolvers/EntityListenerResolverTest.php
@@ -1,10 +1,14 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Resolvers;
+
 use Doctrine\ORM\Mapping\EntityListenerResolver as ResolverContract;
 use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\ORM\Resolvers\EntityListenerResolver;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
+use stdClass;
+use TypeError;
 
 class EntityListenerResolverTest extends TestCase
 {
diff --git a/tests/Feature/Serializers/ArraySerializerTest.php b/tests/Feature/Serializers/ArraySerializerTest.php
index 0009b92f..9c5e6537 100644
--- a/tests/Feature/Serializers/ArraySerializerTest.php
+++ b/tests/Feature/Serializers/ArraySerializerTest.php
@@ -1,8 +1,9 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Serializers;
+
 use LaravelDoctrine\ORM\Serializers\Arrayable;
 use LaravelDoctrine\ORM\Serializers\ArraySerializer;
-use LaravelDoctrine\ORM\Serializers\Jsonable;
 use PHPUnit\Framework\TestCase;
 
 class ArraySerializerTest extends TestCase
diff --git a/tests/Feature/Serializers/JsonSerializerTest.php b/tests/Feature/Serializers/JsonSerializerTest.php
index 25896863..fa11f92d 100644
--- a/tests/Feature/Serializers/JsonSerializerTest.php
+++ b/tests/Feature/Serializers/JsonSerializerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Serializers;
+
 use LaravelDoctrine\ORM\Serializers\Jsonable;
 use LaravelDoctrine\ORM\Serializers\JsonSerializer;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Feature/Testing/Concerns/InteractsWithEntitiesTest.php b/tests/Feature/Testing/Concerns/InteractsWithEntitiesTest.php
index a13a6442..e1c0c6fd 100644
--- a/tests/Feature/Testing/Concerns/InteractsWithEntitiesTest.php
+++ b/tests/Feature/Testing/Concerns/InteractsWithEntitiesTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Testing\Concerns;
+
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\ORM\Testing\Concerns\InteractsWithEntities;
+use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use PHPUnit\Framework\ExpectationFailedException;
 
diff --git a/tests/Feature/Testing/FactoryBuilderTest.php b/tests/Feature/Testing/FactoryBuilderTest.php
index affba022..77b0c5d3 100644
--- a/tests/Feature/Testing/FactoryBuilderTest.php
+++ b/tests/Feature/Testing/FactoryBuilderTest.php
@@ -1,11 +1,14 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Testing;
+
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\ORMSetup as Setup;
 use Doctrine\Persistence\ManagerRegistry;
+use Faker;
 use LaravelDoctrine\ORM\Testing\FactoryBuilder;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 
diff --git a/tests/Feature/Testing/FactoryTest.php b/tests/Feature/Testing/FactoryTest.php
index 3b01cbfd..a3241fc4 100644
--- a/tests/Feature/Testing/FactoryTest.php
+++ b/tests/Feature/Testing/FactoryTest.php
@@ -1,7 +1,11 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Testing;
+
 use Doctrine\Persistence\ManagerRegistry;
+use Faker;
 use LaravelDoctrine\ORM\Testing\Factory;
+use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 
 class FactoryTest extends MockeryTestCase
diff --git a/tests/Feature/Testing/SimpleHydratorTest.php b/tests/Feature/Testing/SimpleHydratorTest.php
index 68f2b223..fb90d1eb 100644
--- a/tests/Feature/Testing/SimpleHydratorTest.php
+++ b/tests/Feature/Testing/SimpleHydratorTest.php
@@ -1,17 +1,21 @@
 <?php
 
+namespace LaravelDoctrineTest\ORM\Feature\Testing;
+
 use LaravelDoctrine\ORM\Testing\SimpleHydrator;
+use LaravelDoctrineTest\ORM\Assets\Testing\AncestorHydrateableClass;
+use LaravelDoctrineTest\ORM\Assets\Testing\ChildHydrateableClass;
 use PHPUnit\Framework\TestCase;
 
 class SimpleHydratorTest extends TestCase
 {
     public function test_can_hydrate_class()
     {
-        $entity = SimpleHydrator::hydrate(BaseHydrateableClass::class, [
+        $entity = SimpleHydrator::hydrate(AncestorHydrateableClass::class, [
             'name' => 'Patrick',
         ]);
 
-        $this->assertInstanceOf(BaseHydrateableClass::class, $entity);
+        $this->assertInstanceOf(AncestorHydrateableClass::class, $entity);
         $this->assertEquals('Patrick', $entity->getName());
     }
 
@@ -27,23 +31,3 @@ public function test_can_hydrate_with_extension_of_private_properties()
         $this->assertEquals('Hello World', $entity->getDescription());
     }
 }
-
-class ChildHydrateableClass extends BaseHydrateableClass
-{
-    private $description;
-
-    public function getDescription()
-    {
-        return $this->description;
-    }
-}
-
-class BaseHydrateableClass
-{
-    private $name;
-
-    public function getName()
-    {
-        return $this->name;
-    }
-}
diff --git a/tests/Feature/Validation/DoctrinePresenceVerifierTest.php b/tests/Feature/Validation/DoctrinePresenceVerifierTest.php
index ed933f2b..36130394 100644
--- a/tests/Feature/Validation/DoctrinePresenceVerifierTest.php
+++ b/tests/Feature/Validation/DoctrinePresenceVerifierTest.php
@@ -1,10 +1,15 @@
 <?php
 
-use Doctrine\ORM\AbstractQuery;
+namespace LaravelDoctrineTest\ORM\Feature\Validation;
+
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
+use InvalidArgumentException;
 use LaravelDoctrine\ORM\Validation\DoctrinePresenceVerifier;
+use LaravelDoctrineTest\ORM\Assets\Mock\CountableEntityMock;
 use Mockery as m;
 use Mockery\Mock;
 use PHPUnit\Framework\TestCase;
@@ -43,7 +48,7 @@ protected function setUp(): void
         $this->em       = m::mock(EntityManagerInterface::class);
         $this->registry = m::mock(ManagerRegistry::class);
         $this->builder  = m::mock(QueryBuilder::class);
-        $this->query    = m::mock(Doctrine\ORM\Query::class);
+        $this->query    = m::mock(Query::class);
 
         $this->verifier = new DoctrinePresenceVerifier(
             $this->registry
@@ -200,7 +205,7 @@ public function test_counting_invalid_entity_throws_exception()
             ->andReturn(null);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('No Entity Manager could be found for [CountableEntityMock].');
+        $this->expectExceptionMessage('No Entity Manager could be found for [LaravelDoctrineTest\ORM\Assets\Mock\CountableEntityMock].');
 
         $this->verifier->getCount(CountableEntityMock::class, 'email', 'test@email.com');
     }
@@ -254,7 +259,7 @@ protected function defaultGetMultiCountMocks()
         $this->builder->shouldReceive('where')
                       ->once();
 
-        $this->builder->shouldReceive('expr')->andReturn(new \Doctrine\ORM\Query\Expr());
+        $this->builder->shouldReceive('expr')->andReturn(new Expr());
         $this->builder->shouldReceive('in')->with("e.email", ['test@email.com']);
 
         $this->builder->shouldReceive('getQuery')
@@ -268,7 +273,3 @@ protected function tearDown(): void
         m::close();
     }
 }
-
-class CountableEntityMock
-{
-}
diff --git a/tests/Stubs/Faker/Generator.php b/tests/Stubs/Faker/Generator.php
deleted file mode 100644
index 436204b7..00000000
--- a/tests/Stubs/Faker/Generator.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Faker;
-
-interface Generator
-{
-}