diff --git a/tests/Analyze/EntityAnalyzerTest.php b/tests/Analyze/EntityAnalyzerTest.php
index 6a36b88..68f0d6a 100644
--- a/tests/Analyze/EntityAnalyzerTest.php
+++ b/tests/Analyze/EntityAnalyzerTest.php
@@ -7,9 +7,6 @@ namespace Kartierung\Analyze;
 use Kartierung\Analyze\Exception\InvalidEntity;
 use Kartierung\Analyze\Result\EntityField;
 use Kartierung\Analyze\Result\FieldAccess;
-use Kartierung\EntityWithoutId;
-use Kartierung\EntityWithoutTableAttribute;
-use Kartierung\EntityWithTwoIds;
 use Kartierung\FullEntity;
 use Kartierung\PropertyPropagatedEntity;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/EntityWithTwoIds.php b/tests/Analyze/EntityWithTwoIds.php
similarity index 65%
rename from tests/EntityWithTwoIds.php
rename to tests/Analyze/EntityWithTwoIds.php
index 8b8e183..5f64512 100644
--- a/tests/EntityWithTwoIds.php
+++ b/tests/Analyze/EntityWithTwoIds.php
@@ -2,11 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Kartierung;
+namespace Kartierung\Analyze;
 
-use Kartierung\Attribute\Column;
 use Kartierung\Attribute\Id;
-use Kartierung\Attribute\Table;
 
 class EntityWithTwoIds
 {
diff --git a/tests/Analyze/EntityWithoutId.php b/tests/Analyze/EntityWithoutId.php
new file mode 100644
index 0000000..1cff2ac
--- /dev/null
+++ b/tests/Analyze/EntityWithoutId.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kartierung\Analyze;
+
+class EntityWithoutId
+{
+    public string $stringField;
+}
diff --git a/tests/EntityWithoutTableAttribute.php b/tests/Analyze/EntityWithoutTableAttribute.php
similarity index 85%
rename from tests/EntityWithoutTableAttribute.php
rename to tests/Analyze/EntityWithoutTableAttribute.php
index aef2b16..00dcad9 100644
--- a/tests/EntityWithoutTableAttribute.php
+++ b/tests/Analyze/EntityWithoutTableAttribute.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Kartierung;
+namespace Kartierung\Analyze;
 
 use Kartierung\Attribute\Id;
 
diff --git a/tests/InvalidListResultOfRepository.php b/tests/Analyze/InvalidListResultOfRepository.php
similarity index 86%
rename from tests/InvalidListResultOfRepository.php
rename to tests/Analyze/InvalidListResultOfRepository.php
index 456157b..4d38285 100644
--- a/tests/InvalidListResultOfRepository.php
+++ b/tests/Analyze/InvalidListResultOfRepository.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Kartierung;
+namespace Kartierung\Analyze;
 
 use Kartierung\Attribute\ListResultOf;
 
diff --git a/tests/Repository.php b/tests/Analyze/Repository.php
similarity index 91%
rename from tests/Repository.php
rename to tests/Analyze/Repository.php
index 2fc6699..ae5b528 100644
--- a/tests/Repository.php
+++ b/tests/Analyze/Repository.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Kartierung;
+namespace Kartierung\Analyze;
 
 use Kartierung\Attribute\ListResultOf;
 use Kartierung\Attribute\Query;
+use Kartierung\FullEntity;
 
 interface Repository
 {
diff --git a/tests/Analyze/RepositoryAnalyzerTest.php b/tests/Analyze/RepositoryAnalyzerTest.php
index f5edb82..467df89 100644
--- a/tests/Analyze/RepositoryAnalyzerTest.php
+++ b/tests/Analyze/RepositoryAnalyzerTest.php
@@ -5,11 +5,11 @@ declare(strict_types=1);
 namespace Analyze;
 
 use Kartierung\Analyze\Exception\InvalidRepository;
+use Kartierung\Analyze\InvalidListResultOfRepository;
+use Kartierung\Analyze\Repository;
 use Kartierung\Analyze\RepositoryAnalyzer;
 use Kartierung\Analyze\Result\RepositoryMethodParameter;
 use Kartierung\FullEntity;
-use Kartierung\InvalidListResultOfRepository;
-use Kartierung\Repository;
 use Kartierung\Repository\ResolutionStrategy\ResolutionStrategyFactory;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/EntityWithoutId.php b/tests/EntityWithoutId.php
deleted file mode 100644
index dd6a3e3..0000000
--- a/tests/EntityWithoutId.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Kartierung;
-
-use Kartierung\Attribute\Column;
-use Kartierung\Attribute\Id;
-use Kartierung\Attribute\Table;
-
-class EntityWithoutId
-{
-    public string $stringField;
-}
diff --git a/tests/Sql/DateToEntityMapperTest.php b/tests/Sql/DataToEntityMapperTest.php
similarity index 97%
rename from tests/Sql/DateToEntityMapperTest.php
rename to tests/Sql/DataToEntityMapperTest.php
index 550b573..ca42db0 100644
--- a/tests/Sql/DateToEntityMapperTest.php
+++ b/tests/Sql/DataToEntityMapperTest.php
@@ -9,7 +9,7 @@ use Kartierung\Analyze\Result\EntityResult;
 use Kartierung\Analyze\Result\FieldAccess;
 use PHPUnit\Framework\TestCase;
 
-class DateToEntityMapperTest extends TestCase
+class DataToEntityMapperTest extends TestCase
 {
     public function testMapsWithDifferentMethods(): void
     {
diff --git a/tests/UnionReturnTypeRepository.php b/tests/UnionReturnTypeRepository.php
deleted file mode 100644
index ec5aa56..0000000
--- a/tests/UnionReturnTypeRepository.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Kartierung;
-
-interface UnionReturnTypeRepository
-{
-    public function returnsUnion(): int|string;
-}