diff --git a/tests/Unit/Account/AccountEntityTest.php b/tests/Unit/Entities/Account/AccountEntityTest.php
similarity index 95%
rename from tests/Unit/Account/AccountEntityTest.php
rename to tests/Unit/Entities/Account/AccountEntityTest.php
index 2721aca..5c2c3bd 100644
--- a/tests/Unit/Account/AccountEntityTest.php
+++ b/tests/Unit/Entities/Account/AccountEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Account;
+namespace Tests\Unit\Entities\Account;
 
 use Core\Application\Account\Commons\Exceptions\AccountNameInvalidException;
 use Core\Domain\Entities\Account\AccountEntity;
diff --git a/tests/Unit/Account/AccountJoinCodeEntityTest.php b/tests/Unit/Entities/Account/AccountJoinCodeEntityTest.php
similarity index 98%
rename from tests/Unit/Account/AccountJoinCodeEntityTest.php
rename to tests/Unit/Entities/Account/AccountJoinCodeEntityTest.php
index d0cce7c..950041e 100644
--- a/tests/Unit/Account/AccountJoinCodeEntityTest.php
+++ b/tests/Unit/Entities/Account/AccountJoinCodeEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Account;
+namespace Tests\Unit\Entities\Account;
 
 use Core\Application\Account\Commons\Exceptions\AccountJoinCodeInvalidException;
 use Core\Domain\Entities\Account\AccountJoinCodeEntity;
diff --git a/tests/Unit/Project/ProjectEntityTest.php b/tests/Unit/Entities/Project/ProjectEntityTest.php
similarity index 80%
rename from tests/Unit/Project/ProjectEntityTest.php
rename to tests/Unit/Entities/Project/ProjectEntityTest.php
index 44f2bca..9a5a1f0 100644
--- a/tests/Unit/Project/ProjectEntityTest.php
+++ b/tests/Unit/Entities/Project/ProjectEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Project;
+namespace Tests\Unit\Entities\Project;
 
 use Core\Domain\Entities\Account\AccountEntity;
 use Core\Domain\Entities\Project\ProjectEntity;
@@ -104,20 +104,20 @@ public function test_create_project_fail_with_date_start_at_equal_finished_at()
     {
         $this->expectException(DatesMustBeDifferntsException::class);
         ProjectEntity::forCreate(
-            'Project Name',
-            'Project Description',
-            UserEntity::forIdentify(
-                1,
-                Uuid::uuid7(),
-                UserRoles::ADMIN,
-                1
+            name: 'Project Name',
+            description: 'Project Description',
+            user: UserEntity::forIdentify(
+                id: 1,
+                uuid: Uuid::uuid7(),
+                role: UserRoles::ADMIN,
+                accountId: 1
             ),
-            AccountEntity::forIdentify(
-                1
+            account: AccountEntity::forIdentify(
+                id: 1
             ),
-            Uuid::uuid7(),
-            now(),
-            now()
+            uuid: Uuid::uuid7(),
+            startAt: now(),
+            finishAt: now()
         );
     }
 
@@ -125,20 +125,20 @@ public function test_create_project_fail_with_date_start_at_before_now()
     {
         $this->expectException(DateMustBeInCurrentDayException::class);
         ProjectEntity::forCreate(
-            'Project Name',
-            'Project Description',
-            UserEntity::forIdentify(
-                1,
-                Uuid::uuid7(),
-                UserRoles::ADMIN,
-                1
+            name: 'Project Name',
+            description: 'Project Description',
+            user: UserEntity::forIdentify(
+                id: 1,
+                uuid: Uuid::uuid7(),
+                role: UserRoles::ADMIN,
+                accountId: 1
             ),
-            AccountEntity::forIdentify(
+            account: AccountEntity::forIdentify(
                 1
             ),
-            Uuid::uuid7(),
-            now()->subDay(),
-            now()
+            uuid: Uuid::uuid7(),
+            startAt: now()->subDay(),
+            finishAt: now()
         );
     }
 }
diff --git a/tests/Unit/User/Entity/UserEntityRolesTest.php b/tests/Unit/Entities/User/UserEntityRolesTest.php
similarity index 99%
rename from tests/Unit/User/Entity/UserEntityRolesTest.php
rename to tests/Unit/Entities/User/UserEntityRolesTest.php
index 0d7fb32..46ab911 100644
--- a/tests/Unit/User/Entity/UserEntityRolesTest.php
+++ b/tests/Unit/Entities/User/UserEntityRolesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\User\Entity;
+namespace Tests\Unit\Entities\User;
 
 use Core\Domain\Entities\User\UserEntity;
 use Core\Support\Exceptions\InvalideRules\InvalidRoleException;
diff --git a/tests/Unit/User/Entity/UserEntityTest.php b/tests/Unit/Entities/User/UserEntityTest.php
similarity index 99%
rename from tests/Unit/User/Entity/UserEntityTest.php
rename to tests/Unit/Entities/User/UserEntityTest.php
index 7db9e67..643531e 100644
--- a/tests/Unit/User/Entity/UserEntityTest.php
+++ b/tests/Unit/Entities/User/UserEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\User\Entity;
+namespace Tests\Unit\Entities\User;
 
 use Core\Domain\Entities\Account\AccountEntity;
 use Core\Domain\Entities\User\UserEntity;
diff --git a/tests/Unit/User/Entity/UserValidationForSameAccountTest.php b/tests/Unit/Entities/User/UserValidationForSameAccountTest.php
similarity index 97%
rename from tests/Unit/User/Entity/UserValidationForSameAccountTest.php
rename to tests/Unit/Entities/User/UserValidationForSameAccountTest.php
index 91d1610..ec34b97 100644
--- a/tests/Unit/User/Entity/UserValidationForSameAccountTest.php
+++ b/tests/Unit/Entities/User/UserValidationForSameAccountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\User\Entity;
+namespace Tests\Unit\Entities\User;
 
 use Core\Domain\Entities\User\UserEntity;
 use Core\Support\Exceptions\Access\ForbidenException;