diff --git a/composer.json b/composer.json
index c1ae6cc..6e3da31 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,10 @@
     "scripts": {
         "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi",
         "analyse": "vendor/bin/phpstan analyse",
-        "test": "vendor/bin/pest",
+        "test": [
+            "@composer dump-autoload",
+            "vendor/bin/pest"
+        ],
         "test-coverage": "vendor/bin/pest --coverage",
         "format": "vendor/bin/pint",
         "lint": "vendor/bin/pint"
diff --git a/src/Support/DomainAutoloader.php b/src/Support/DomainAutoloader.php
index f107dc0..c203803 100644
--- a/src/Support/DomainAutoloader.php
+++ b/src/Support/DomainAutoloader.php
@@ -50,7 +50,7 @@ public function autoload(): void
     protected static function normalizePaths($path): array
     {
         return collect($path)
-            ->filter(fn ($path) => is_dir($path))
+            ->filter(fn($path) => is_dir($path))
             ->toArray();
     }
 
@@ -99,27 +99,27 @@ protected function handlePolicies(): void
             return Arr::wrap(Collection::times(count($classDirnameSegments), function ($index) use ($class, $classDirnameSegments) {
                 $classDirname = implode('\\', array_slice($classDirnameSegments, 0, $index));
 
-                return $classDirname.'\\Policies\\'.class_basename($class).'Policy';
+                return $classDirname . '\\Policies\\' . class_basename($class) . 'Policy';
             })->reverse()->values()->first(function ($class) {
                 return class_exists($class);
-            }) ?: [$classDirname.'\\Policies\\'.class_basename($class).'Policy']);
+            }) ?: [$classDirname . '\\Policies\\' . class_basename($class) . 'Policy']);
         });
     }
 
     protected function handleFactories(): void
     {
         Factory::guessFactoryNamesUsing(function (string $modelName) {
-            if (DomainResolver::isDomainClass($modelName)) {
-                return DomainFactory::factoryForModel($modelName);
+            if ($factoryName = DomainFactory::resolveFactoryName($modelName)) {
+                return $factoryName;
             }
 
             $appNamespace = static::appNamespace();
 
-            $modelName = Str::startsWith($modelName, $appNamespace.'Models\\')
-                ? Str::after($modelName, $appNamespace.'Models\\')
+            $modelName = Str::startsWith($modelName, $appNamespace . 'Models\\')
+                ? Str::after($modelName, $appNamespace . 'Models\\')
                 : Str::after($modelName, $appNamespace);
 
-            return 'Database\\Factories\\'.$modelName.'Factory';
+            return 'Database\\Factories\\' . $modelName . 'Factory';
         });
     }
 
@@ -132,7 +132,7 @@ protected static function finder($paths)
                 ->finish('/');
 
             $ignoredFolders = collect(config('ddd.autoload_ignore', []))
-                ->map(fn ($path) => Str::finish($path, '/'));
+                ->map(fn($path) => Str::finish($path, '/'));
 
             if ($pathAfterDomain->startsWith($ignoredFolders)) {
                 return false;