diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..d973a01c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+/.* export-ignore
+/Tests export-ignore
+/DEVELOPER-GUIDE.md export-ignore
+/phplint.sh export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/lib/Tests/Fhp/CLILogger.php b/Tests/CLILogger.php
similarity index 79%
rename from lib/Tests/Fhp/CLILogger.php
rename to Tests/CLILogger.php
index 655504f8..96a1526b 100644
--- a/lib/Tests/Fhp/CLILogger.php
+++ b/Tests/CLILogger.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Tests\Fhp;
+namespace Fhp\Tests;
+
+use Psr\Log\AbstractLogger;
 
 /**
  * A logger that prints log messages to the console (just PHP `echo`). This class is designed to be used only for
  * testing purposes.
  */
-class CLILogger extends \Psr\Log\AbstractLogger
+class CLILogger extends AbstractLogger
 {
     public function log($level, $message, array $context = []): void
     {
diff --git a/lib/Tests/Fhp/FinTsPeer.php b/Tests/FinTsPeer.php
similarity index 97%
rename from lib/Tests/Fhp/FinTsPeer.php
rename to Tests/FinTsPeer.php
index 3ee01d5c..804242ec 100644
--- a/lib/Tests/Fhp/FinTsPeer.php
+++ b/Tests/FinTsPeer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp;
+namespace Fhp\Tests;
 
 use Fhp\Connection;
 use Fhp\FinTs;
diff --git a/lib/Tests/Fhp/Action/SendSEPATransferTest.php b/Tests/Unit/Action/SendSEPATransferTest.php
similarity index 94%
rename from lib/Tests/Fhp/Action/SendSEPATransferTest.php
rename to Tests/Unit/Action/SendSEPATransferTest.php
index 03a81515..245180d0 100644
--- a/lib/Tests/Fhp/Action/SendSEPATransferTest.php
+++ b/Tests/Unit/Action/SendSEPATransferTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Fhp\Action;
+namespace Fhp\Tests\Unit\Action;
 
 use Fhp\Protocol\Message;
 use Fhp\Syntax\Serializer;
-use Tests\Fhp\Integration\DKB\SendSEPATransferTest as DKBSendSEPATransferTest;
+use Fhp\Tests\Unit\Integration\DKB\SendSEPATransferTest as DKBSendSEPATransferTest;
 
 class SendSEPATransferTest extends DKBSendSEPATransferTest
 {
diff --git a/lib/Tests/Fhp/BaseActionTanSerializationTest.php b/Tests/Unit/BaseActionTanSerializationTest.php
similarity index 91%
rename from lib/Tests/Fhp/BaseActionTanSerializationTest.php
rename to Tests/Unit/BaseActionTanSerializationTest.php
index a33b2fdf..d8b05d0d 100644
--- a/lib/Tests/Fhp/BaseActionTanSerializationTest.php
+++ b/Tests/Unit/BaseActionTanSerializationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Fhp;
+namespace Fhp\Tests\Unit;
 
-use Tests\Fhp\Integration\DKB\SendSEPATransferTest as DKBSendSEPATransferTest;
+use Fhp\Tests\Unit\Integration\DKB\SendSEPATransferTest as DKBSendSEPATransferTest;
 
 class BaseActionTanSerializationTest extends DKBSendSEPATransferTest
 {
diff --git a/lib/Tests/Fhp/BaseActionVopSerializationTest.php b/Tests/Unit/BaseActionVopSerializationTest.php
similarity index 96%
rename from lib/Tests/Fhp/BaseActionVopSerializationTest.php
rename to Tests/Unit/BaseActionVopSerializationTest.php
index 5546c146..2f5674b7 100644
--- a/lib/Tests/Fhp/BaseActionVopSerializationTest.php
+++ b/Tests/Unit/BaseActionVopSerializationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Fhp;
+namespace Fhp\Tests\Unit;
 
-use Tests\Fhp\Integration\Atruvia\SendTransferVoPTest;
+use Fhp\Tests\Unit\Integration\Atruvia\SendTransferVoPTest;
 
 class BaseActionVopSerializationTest extends SendTransferVoPTest
 {
diff --git a/lib/Tests/Fhp/FinTsTestCase.php b/Tests/Unit/FinTsTestCase.php
similarity index 97%
rename from lib/Tests/Fhp/FinTsTestCase.php
rename to Tests/Unit/FinTsTestCase.php
index b09041a1..9cf4fa1d 100644
--- a/lib/Tests/Fhp/FinTsTestCase.php
+++ b/Tests/Unit/FinTsTestCase.php
@@ -1,12 +1,13 @@
 <?php
 /** @noinspection PhpUndefinedClassInspection */
 
-namespace Tests\Fhp;
+namespace Fhp\Tests\Unit;
 
 use Fhp\Connection;
 use Fhp\Options\Credentials;
 use Fhp\Options\FinTsOptions;
 use Fhp\Segment\HNHBK\HNHBKv3;
+use Fhp\Tests\FinTsPeer;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -73,7 +74,7 @@ protected function setUpConnection()
 
             // Grab the next expected request and its mock response.
             $this->assertNotEmpty($this->expectedMessages, "Expected no more requests, but got: $request");
-            list($expectedRequest, $mockResponse) = array_shift($this->expectedMessages);
+            [$expectedRequest, $mockResponse] = array_shift($this->expectedMessages);
 
             // Check that the request matches the expectation.
             if (strlen($expectedRequest) > 0 && !str_starts_with($expectedRequest, 'HNHBK')) {
diff --git a/lib/Tests/Fhp/Integration/Atruvia/AtruviaIntegrationTestBase.php b/Tests/Unit/Integration/Atruvia/AtruviaIntegrationTestBase.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/Atruvia/AtruviaIntegrationTestBase.php
rename to Tests/Unit/Integration/Atruvia/AtruviaIntegrationTestBase.php
index efdd4555..d03e7479 100644
--- a/lib/Tests/Fhp/Integration/Atruvia/AtruviaIntegrationTestBase.php
+++ b/Tests/Unit/Integration/Atruvia/AtruviaIntegrationTestBase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Integration\Atruvia;
+namespace Fhp\Tests\Unit\Integration\Atruvia;
 
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class AtruviaIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/Atruvia/SendTransferVoPTest.php b/Tests/Unit/Integration/Atruvia/SendTransferVoPTest.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/Atruvia/SendTransferVoPTest.php
rename to Tests/Unit/Integration/Atruvia/SendTransferVoPTest.php
index 19bb3a71..294719e4 100644
--- a/lib/Tests/Fhp/Integration/Atruvia/SendTransferVoPTest.php
+++ b/Tests/Unit/Integration/Atruvia/SendTransferVoPTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\Atruvia;
+namespace Fhp\Tests\Unit\Integration\Atruvia;
 
 use Fhp\Action\SendSEPATransfer;
 use Fhp\Model\VopVerificationResult;
diff --git a/lib/Tests/Fhp/Integration/Consors/ConsorsIntegrationTestBase.php b/Tests/Unit/Integration/Consors/ConsorsIntegrationTestBase.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/Consors/ConsorsIntegrationTestBase.php
rename to Tests/Unit/Integration/Consors/ConsorsIntegrationTestBase.php
index c47db054..5693660d 100644
--- a/lib/Tests/Fhp/Integration/Consors/ConsorsIntegrationTestBase.php
+++ b/Tests/Unit/Integration/Consors/ConsorsIntegrationTestBase.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Fhp\Integration\Consors;
+namespace Fhp\Tests\Unit\Integration\Consors;
 
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsPeer;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\FinTsPeer;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class ConsorsIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/Consors/GetBPDTest.php b/Tests/Unit/Integration/Consors/GetBPDTest.php
similarity index 90%
rename from lib/Tests/Fhp/Integration/Consors/GetBPDTest.php
rename to Tests/Unit/Integration/Consors/GetBPDTest.php
index ffd2e400..9d20ee3d 100644
--- a/lib/Tests/Fhp/Integration/Consors/GetBPDTest.php
+++ b/Tests/Unit/Integration/Consors/GetBPDTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Fhp\Integration\Consors;
+namespace Fhp\Tests\Unit\Integration\Consors;
 
-use Tests\Fhp\FinTsPeer;
+use Fhp\Tests\FinTsPeer;
 
 class GetBPDTest extends ConsorsIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/Consors/GetSEPAAccountsTest.php b/Tests/Unit/Integration/Consors/GetSEPAAccountsTest.php
similarity index 96%
rename from lib/Tests/Fhp/Integration/Consors/GetSEPAAccountsTest.php
rename to Tests/Unit/Integration/Consors/GetSEPAAccountsTest.php
index 396eb018..577d624b 100644
--- a/lib/Tests/Fhp/Integration/Consors/GetSEPAAccountsTest.php
+++ b/Tests/Unit/Integration/Consors/GetSEPAAccountsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\Consors;
+namespace Fhp\Tests\Unit\Integration\Consors;
 
 class GetSEPAAccountsTest extends ConsorsIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/Consors/GetStatementOfAccountTest.php b/Tests/Unit/Integration/Consors/GetStatementOfAccountTest.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/Consors/GetStatementOfAccountTest.php
rename to Tests/Unit/Integration/Consors/GetStatementOfAccountTest.php
index a492764b..be5cfd60 100644
--- a/lib/Tests/Fhp/Integration/Consors/GetStatementOfAccountTest.php
+++ b/Tests/Unit/Integration/Consors/GetStatementOfAccountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\Consors;
+namespace Fhp\Tests\Unit\Integration\Consors;
 
 use Fhp\Model\StatementOfAccount\Statement;
 
diff --git a/lib/Tests/Fhp/Integration/Consors/InitEndDialogTest.php b/Tests/Unit/Integration/Consors/InitEndDialogTest.php
similarity index 98%
rename from lib/Tests/Fhp/Integration/Consors/InitEndDialogTest.php
rename to Tests/Unit/Integration/Consors/InitEndDialogTest.php
index 867bcf89..49eb54b1 100644
--- a/lib/Tests/Fhp/Integration/Consors/InitEndDialogTest.php
+++ b/Tests/Unit/Integration/Consors/InitEndDialogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\Consors;
+namespace Fhp\Tests\Unit\Integration\Consors;
 
 use Fhp\CurlException;
 use Fhp\Protocol\ServerException;
diff --git a/lib/Tests/Fhp/Integration/DKB/DKBIntegrationTestBase.php b/Tests/Unit/Integration/DKB/DKBIntegrationTestBase.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/DKB/DKBIntegrationTestBase.php
rename to Tests/Unit/Integration/DKB/DKBIntegrationTestBase.php
index 6efe6122..5b70ddda 100644
--- a/lib/Tests/Fhp/Integration/DKB/DKBIntegrationTestBase.php
+++ b/Tests/Unit/Integration/DKB/DKBIntegrationTestBase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Integration\DKB;
+namespace Fhp\Tests\Unit\Integration\DKB;
 
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class DKBIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/DKB/GetBalanceTest.php b/Tests/Unit/Integration/DKB/GetBalanceTest.php
similarity index 97%
rename from lib/Tests/Fhp/Integration/DKB/GetBalanceTest.php
rename to Tests/Unit/Integration/DKB/GetBalanceTest.php
index a903a31b..ac2244ae 100644
--- a/lib/Tests/Fhp/Integration/DKB/GetBalanceTest.php
+++ b/Tests/Unit/Integration/DKB/GetBalanceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\DKB;
+namespace Fhp\Tests\Unit\Integration\DKB;
 
 use Fhp\Action\GetBalance;
 
diff --git a/lib/Tests/Fhp/Integration/DKB/GetSEPAAccountsTest.php b/Tests/Unit/Integration/DKB/GetSEPAAccountsTest.php
similarity index 96%
rename from lib/Tests/Fhp/Integration/DKB/GetSEPAAccountsTest.php
rename to Tests/Unit/Integration/DKB/GetSEPAAccountsTest.php
index 6cac0fb0..0501b818 100644
--- a/lib/Tests/Fhp/Integration/DKB/GetSEPAAccountsTest.php
+++ b/Tests/Unit/Integration/DKB/GetSEPAAccountsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\DKB;
+namespace Fhp\Tests\Unit\Integration\DKB;
 
 class GetSEPAAccountsTest extends DKBIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/DKB/GetStatementOfAccountTest.php b/Tests/Unit/Integration/DKB/GetStatementOfAccountTest.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/DKB/GetStatementOfAccountTest.php
rename to Tests/Unit/Integration/DKB/GetStatementOfAccountTest.php
index ebd0c176..7eda54a2 100644
--- a/lib/Tests/Fhp/Integration/DKB/GetStatementOfAccountTest.php
+++ b/Tests/Unit/Integration/DKB/GetStatementOfAccountTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Fhp\Integration\DKB;
+namespace Fhp\Tests\Unit\Integration\DKB;
 
 use Fhp\Action\GetStatementOfAccount;
 use Fhp\Model\StatementOfAccount\Statement;
 use Fhp\Model\StatementOfAccount\StatementOfAccount;
-use Tests\Fhp\FinTsPeer;
+use Fhp\Tests\FinTsPeer;
 
 class GetStatementOfAccountTest extends DKBIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/DKB/InitEndDialogTest.php b/Tests/Unit/Integration/DKB/InitEndDialogTest.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/DKB/InitEndDialogTest.php
rename to Tests/Unit/Integration/DKB/InitEndDialogTest.php
index 192383c1..4fb09034 100644
--- a/lib/Tests/Fhp/Integration/DKB/InitEndDialogTest.php
+++ b/Tests/Unit/Integration/DKB/InitEndDialogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\DKB;
+namespace Fhp\Tests\Unit\Integration\DKB;
 
 class InitEndDialogTest extends DKBIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/DKB/SendSEPATransferTest.php b/Tests/Unit/Integration/DKB/SendSEPATransferTest.php
similarity index 98%
rename from lib/Tests/Fhp/Integration/DKB/SendSEPATransferTest.php
rename to Tests/Unit/Integration/DKB/SendSEPATransferTest.php
index cdaa0116..e4b4907d 100644
--- a/lib/Tests/Fhp/Integration/DKB/SendSEPATransferTest.php
+++ b/Tests/Unit/Integration/DKB/SendSEPATransferTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Integration\DKB;
+namespace Fhp\Tests\Unit\Integration\DKB;
 
 use Fhp\Action\SendSEPATransfer;
-use Tests\Fhp\FinTsPeer;
+use Fhp\Tests\FinTsPeer;
 
 class SendSEPATransferTest extends DKBIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/GLS/GLSIntegrationTestBase.php b/Tests/Unit/Integration/GLS/GLSIntegrationTestBase.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/GLS/GLSIntegrationTestBase.php
rename to Tests/Unit/Integration/GLS/GLSIntegrationTestBase.php
index 98e6459d..d24d0f7c 100644
--- a/lib/Tests/Fhp/Integration/GLS/GLSIntegrationTestBase.php
+++ b/Tests/Unit/Integration/GLS/GLSIntegrationTestBase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Integration\GLS;
+namespace Fhp\Tests\Unit\Integration\GLS;
 
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class GLSIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/GLS/GetStatementOfAccountXMLTest.php b/Tests/Unit/Integration/GLS/GetStatementOfAccountXMLTest.php
similarity index 98%
rename from lib/Tests/Fhp/Integration/GLS/GetStatementOfAccountXMLTest.php
rename to Tests/Unit/Integration/GLS/GetStatementOfAccountXMLTest.php
index 8e12903c..b2bfdb66 100644
--- a/lib/Tests/Fhp/Integration/GLS/GetStatementOfAccountXMLTest.php
+++ b/Tests/Unit/Integration/GLS/GetStatementOfAccountXMLTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Fhp\Integration\GLS;
+namespace Fhp\Tests\Unit\Integration\GLS;
 
 use Fhp\Action\GetStatementOfAccount;
 use Fhp\Action\GetStatementOfAccountXML;
 use Fhp\BaseAction;
-use Tests\Fhp\FinTsPeer;
+use Fhp\Tests\FinTsPeer;
 
 class GetStatementOfAccountXMLTest extends GLSIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/GLS/InitEndDialogTest.php b/Tests/Unit/Integration/GLS/InitEndDialogTest.php
similarity index 92%
rename from lib/Tests/Fhp/Integration/GLS/InitEndDialogTest.php
rename to Tests/Unit/Integration/GLS/InitEndDialogTest.php
index 98b0dc86..5d63c020 100644
--- a/lib/Tests/Fhp/Integration/GLS/InitEndDialogTest.php
+++ b/Tests/Unit/Integration/GLS/InitEndDialogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\GLS;
+namespace Fhp\Tests\Unit\Integration\GLS;
 
 class InitEndDialogTest extends GLSIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/IngDiba/GetSEPAAccountsTest.php b/Tests/Unit/Integration/IngDiba/GetSEPAAccountsTest.php
similarity index 97%
rename from lib/Tests/Fhp/Integration/IngDiba/GetSEPAAccountsTest.php
rename to Tests/Unit/Integration/IngDiba/GetSEPAAccountsTest.php
index 25ca6347..975a20f6 100644
--- a/lib/Tests/Fhp/Integration/IngDiba/GetSEPAAccountsTest.php
+++ b/Tests/Unit/Integration/IngDiba/GetSEPAAccountsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\IngDiba;
+namespace Fhp\Tests\Unit\Integration\IngDiba;
 
 class GetSEPAAccountsTest extends IngDibaIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/IngDiba/GetStatementOfAccountTest.php b/Tests/Unit/Integration/IngDiba/GetStatementOfAccountTest.php
similarity index 97%
rename from lib/Tests/Fhp/Integration/IngDiba/GetStatementOfAccountTest.php
rename to Tests/Unit/Integration/IngDiba/GetStatementOfAccountTest.php
index d830cd0f..ee06c0bc 100644
--- a/lib/Tests/Fhp/Integration/IngDiba/GetStatementOfAccountTest.php
+++ b/Tests/Unit/Integration/IngDiba/GetStatementOfAccountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\IngDiba;
+namespace Fhp\Tests\Unit\Integration\IngDiba;
 
 use Fhp\Action\GetStatementOfAccount;
 
diff --git a/lib/Tests/Fhp/Integration/IngDiba/IngDibaIntegrationTestBase.php b/Tests/Unit/Integration/IngDiba/IngDibaIntegrationTestBase.php
similarity index 98%
rename from lib/Tests/Fhp/Integration/IngDiba/IngDibaIntegrationTestBase.php
rename to Tests/Unit/Integration/IngDiba/IngDibaIntegrationTestBase.php
index 7d01b62d..4f07a2ce 100644
--- a/lib/Tests/Fhp/Integration/IngDiba/IngDibaIntegrationTestBase.php
+++ b/Tests/Unit/Integration/IngDiba/IngDibaIntegrationTestBase.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Fhp\Integration\IngDiba;
+namespace Fhp\Tests\Unit\Integration\IngDiba;
 
 use Fhp\Model\NoPsd2TanMode;
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class IngDibaIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/IngDiba/InitDialogWithBlockedPinTest.php b/Tests/Unit/Integration/IngDiba/InitDialogWithBlockedPinTest.php
similarity index 95%
rename from lib/Tests/Fhp/Integration/IngDiba/InitDialogWithBlockedPinTest.php
rename to Tests/Unit/Integration/IngDiba/InitDialogWithBlockedPinTest.php
index cdd250ef..58864648 100644
--- a/lib/Tests/Fhp/Integration/IngDiba/InitDialogWithBlockedPinTest.php
+++ b/Tests/Unit/Integration/IngDiba/InitDialogWithBlockedPinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\IngDiba;
+namespace Fhp\Tests\Unit\Integration\IngDiba;
 
 use Fhp\Protocol\ServerException;
 
diff --git a/lib/Tests/Fhp/Integration/IngDiba/InitEndDialogTest.php b/Tests/Unit/Integration/IngDiba/InitEndDialogTest.php
similarity index 89%
rename from lib/Tests/Fhp/Integration/IngDiba/InitEndDialogTest.php
rename to Tests/Unit/Integration/IngDiba/InitEndDialogTest.php
index a527a528..f0e591ea 100644
--- a/lib/Tests/Fhp/Integration/IngDiba/InitEndDialogTest.php
+++ b/Tests/Unit/Integration/IngDiba/InitEndDialogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\IngDiba;
+namespace Fhp\Tests\Unit\Integration\IngDiba;
 
 class InitEndDialogTest extends IngDibaIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/InitializationErrorTest.php b/Tests/Unit/Integration/InitializationErrorTest.php
similarity index 97%
rename from lib/Tests/Fhp/Integration/InitializationErrorTest.php
rename to Tests/Unit/Integration/InitializationErrorTest.php
index f67ed2b9..d5906cd5 100644
--- a/lib/Tests/Fhp/Integration/InitializationErrorTest.php
+++ b/Tests/Unit/Integration/InitializationErrorTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Integration;
+namespace Fhp\Tests\Unit\Integration;
 
 use Fhp\Protocol\ServerException;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class InitializationErrorTest extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/KSK/Biberach/GetBPDTest.php b/Tests/Unit/Integration/KSK/Biberach/GetBPDTest.php
similarity index 89%
rename from lib/Tests/Fhp/Integration/KSK/Biberach/GetBPDTest.php
rename to Tests/Unit/Integration/KSK/Biberach/GetBPDTest.php
index 8eccfad4..bdb1752b 100644
--- a/lib/Tests/Fhp/Integration/KSK/Biberach/GetBPDTest.php
+++ b/Tests/Unit/Integration/KSK/Biberach/GetBPDTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Fhp\Integration\KSK\Biberach;
+namespace Fhp\Tests\Unit\Integration\KSK\Biberach;
 
-use Tests\Fhp\FinTsPeer;
+use Fhp\Tests\FinTsPeer;
 
 class GetBPDTest extends KskBiberachIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/KSK/Biberach/KskBiberachIntegrationTestBase.php b/Tests/Unit/Integration/KSK/Biberach/KskBiberachIntegrationTestBase.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/KSK/Biberach/KskBiberachIntegrationTestBase.php
rename to Tests/Unit/Integration/KSK/Biberach/KskBiberachIntegrationTestBase.php
index bb5962e8..984e4c0f 100644
--- a/lib/Tests/Fhp/Integration/KSK/Biberach/KskBiberachIntegrationTestBase.php
+++ b/Tests/Unit/Integration/KSK/Biberach/KskBiberachIntegrationTestBase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Fhp\Integration\KSK\Biberach;
+namespace Fhp\Tests\Unit\Integration\KSK\Biberach;
 
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class KskBiberachIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/KSK/InitDialogWithBlockedPinTest.php b/Tests/Unit/Integration/KSK/InitDialogWithBlockedPinTest.php
similarity index 97%
rename from lib/Tests/Fhp/Integration/KSK/InitDialogWithBlockedPinTest.php
rename to Tests/Unit/Integration/KSK/InitDialogWithBlockedPinTest.php
index 31ce73ea..a4b92c39 100644
--- a/lib/Tests/Fhp/Integration/KSK/InitDialogWithBlockedPinTest.php
+++ b/Tests/Unit/Integration/KSK/InitDialogWithBlockedPinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\KSK;
+namespace Fhp\Tests\Unit\Integration\KSK;
 
 use Fhp\Protocol\ServerException;
 
diff --git a/lib/Tests/Fhp/Integration/KSK/KSKIntegrationTestBase.php b/Tests/Unit/Integration/KSK/KSKIntegrationTestBase.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/KSK/KSKIntegrationTestBase.php
rename to Tests/Unit/Integration/KSK/KSKIntegrationTestBase.php
index a945ad0c..49e7c1f6 100644
--- a/lib/Tests/Fhp/Integration/KSK/KSKIntegrationTestBase.php
+++ b/Tests/Unit/Integration/KSK/KSKIntegrationTestBase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Integration\KSK;
+namespace Fhp\Tests\Unit\Integration\KSK;
 
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class KSKIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Integration/Postbank/GetSEPAAccountsTest.php b/Tests/Unit/Integration/Postbank/GetSEPAAccountsTest.php
similarity index 94%
rename from lib/Tests/Fhp/Integration/Postbank/GetSEPAAccountsTest.php
rename to Tests/Unit/Integration/Postbank/GetSEPAAccountsTest.php
index 61ba6850..24b33cd8 100644
--- a/lib/Tests/Fhp/Integration/Postbank/GetSEPAAccountsTest.php
+++ b/Tests/Unit/Integration/Postbank/GetSEPAAccountsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\Postbank;
+namespace Fhp\Tests\Unit\Integration\Postbank;
 
 class GetSEPAAccountsTest extends PostbankIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/Postbank/InitDialogWithBlockedPinTest.php b/Tests/Unit/Integration/Postbank/InitDialogWithBlockedPinTest.php
similarity index 97%
rename from lib/Tests/Fhp/Integration/Postbank/InitDialogWithBlockedPinTest.php
rename to Tests/Unit/Integration/Postbank/InitDialogWithBlockedPinTest.php
index e001300b..c94d18dd 100644
--- a/lib/Tests/Fhp/Integration/Postbank/InitDialogWithBlockedPinTest.php
+++ b/Tests/Unit/Integration/Postbank/InitDialogWithBlockedPinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\Postbank;
+namespace Fhp\Tests\Unit\Integration\Postbank;
 
 use Fhp\Protocol\ServerException;
 
diff --git a/lib/Tests/Fhp/Integration/Postbank/InitEndDialogTest.php b/Tests/Unit/Integration/Postbank/InitEndDialogTest.php
similarity index 89%
rename from lib/Tests/Fhp/Integration/Postbank/InitEndDialogTest.php
rename to Tests/Unit/Integration/Postbank/InitEndDialogTest.php
index 44a3c64c..c429b3af 100644
--- a/lib/Tests/Fhp/Integration/Postbank/InitEndDialogTest.php
+++ b/Tests/Unit/Integration/Postbank/InitEndDialogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Integration\Postbank;
+namespace Fhp\Tests\Unit\Integration\Postbank;
 
 class InitEndDialogTest extends PostbankIntegrationTestBase
 {
diff --git a/lib/Tests/Fhp/Integration/Postbank/PostbankIntegrationTestBase.php b/Tests/Unit/Integration/Postbank/PostbankIntegrationTestBase.php
similarity index 99%
rename from lib/Tests/Fhp/Integration/Postbank/PostbankIntegrationTestBase.php
rename to Tests/Unit/Integration/Postbank/PostbankIntegrationTestBase.php
index 434b6d73..6029c16a 100644
--- a/lib/Tests/Fhp/Integration/Postbank/PostbankIntegrationTestBase.php
+++ b/Tests/Unit/Integration/Postbank/PostbankIntegrationTestBase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Integration\Postbank;
+namespace Fhp\Tests\Unit\Integration\Postbank;
 
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsTestCase;
+use Fhp\Tests\Unit\FinTsTestCase;
 
 class PostbankIntegrationTestBase extends FinTsTestCase
 {
diff --git a/lib/Tests/Fhp/Model/FlickerTan/TanRequestChallengeFlickerTest.php b/Tests/Unit/Model/FlickerTan/TanRequestChallengeFlickerTest.php
similarity index 97%
rename from lib/Tests/Fhp/Model/FlickerTan/TanRequestChallengeFlickerTest.php
rename to Tests/Unit/Model/FlickerTan/TanRequestChallengeFlickerTest.php
index a685cf38..c14f78be 100644
--- a/lib/Tests/Fhp/Model/FlickerTan/TanRequestChallengeFlickerTest.php
+++ b/Tests/Unit/Model/FlickerTan/TanRequestChallengeFlickerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Model\FlickerTan;
+namespace Fhp\Tests\Unit\Model\FlickerTan;
 
 use Fhp\Model\FlickerTan\TanRequestChallengeFlicker;
 use Fhp\Syntax\Bin;
diff --git a/lib/Tests/Fhp/Options/SanitizingLoggerTest.php b/Tests/Unit/Options/SanitizingLoggerTest.php
similarity index 97%
rename from lib/Tests/Fhp/Options/SanitizingLoggerTest.php
rename to Tests/Unit/Options/SanitizingLoggerTest.php
index aa959477..583fd2d7 100644
--- a/lib/Tests/Fhp/Options/SanitizingLoggerTest.php
+++ b/Tests/Unit/Options/SanitizingLoggerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Options;
+namespace Fhp\Tests\Unit\Options;
 
 use Fhp\Options\Credentials;
 use Fhp\Options\FinTsOptions;
diff --git a/lib/Tests/Fhp/Protocol/DialogInitializationTest.php b/Tests/Unit/Protocol/DialogInitializationTest.php
similarity index 83%
rename from lib/Tests/Fhp/Protocol/DialogInitializationTest.php
rename to Tests/Unit/Protocol/DialogInitializationTest.php
index e69d6c41..c7f4c917 100644
--- a/lib/Tests/Fhp/Protocol/DialogInitializationTest.php
+++ b/Tests/Unit/Protocol/DialogInitializationTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Tests\Fhp\Protocol;
+namespace Fhp\Tests\Unit\Protocol;
 
 use Fhp\Protocol\DialogInitialization;
+use PHPUnit\Framework\TestCase;
 
-class DialogInitializationTest extends \PHPUnit\Framework\TestCase
+class DialogInitializationTest extends TestCase
 {
     public function testSerializableInterfaceMigration()
     {
@@ -39,7 +40,7 @@ public function testSerializableInterfaceMigrationFromString()
         // This is a "C" string, generated by the Serializeable Interface
         // The magic method __serialize() would output an "O" string
         // https://wiki.php.net/rfc/custom_object_serialization#encoding_and_interoperability
-        $string = 'C:48:"Tests\Fhp\Protocol\DialogInitializationTestModel":108:{a:5:{i:0;s:43:"a:3:{i:0;N;i:1;N;i:2;s:13:"test-segment2";}";i:1;N;i:2;s:17:"kunden-system-id2";i:3;N;i:4;N;}}';
+        $string = 'C:53:"Fhp\Tests\Unit\Protocol\DialogInitializationTestModel":108:{a:5:{i:0;s:43:"a:3:{i:0;N;i:1;N;i:2;s:13:"test-segment2";}";i:1;N;i:2;s:17:"kunden-system-id2";i:3;N;i:4;N;}}';
 
         /** @var DialogInitialization $object2 */
         $object2 = unserialize($string);
diff --git a/lib/Tests/Fhp/Protocol/DialogInitializationTestModel.php b/Tests/Unit/Protocol/DialogInitializationTestModel.php
similarity index 94%
rename from lib/Tests/Fhp/Protocol/DialogInitializationTestModel.php
rename to Tests/Unit/Protocol/DialogInitializationTestModel.php
index cba3e83b..30fe5e89 100644
--- a/lib/Tests/Fhp/Protocol/DialogInitializationTestModel.php
+++ b/Tests/Unit/Protocol/DialogInitializationTestModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Protocol;
+namespace Fhp\Tests\Unit\Protocol;
 
 use Fhp\Options\Credentials;
 use Fhp\Options\FinTsOptions;
diff --git a/lib/Tests/Fhp/Protocol/ServerExceptionTest.php b/Tests/Unit/Protocol/ServerExceptionTest.php
similarity index 95%
rename from lib/Tests/Fhp/Protocol/ServerExceptionTest.php
rename to Tests/Unit/Protocol/ServerExceptionTest.php
index 940b774e..ac8db039 100644
--- a/lib/Tests/Fhp/Protocol/ServerExceptionTest.php
+++ b/Tests/Unit/Protocol/ServerExceptionTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Tests\Fhp\Protocol;
+namespace Fhp\Tests\Unit\Protocol;
 
 use Fhp\Protocol\Message;
 use Fhp\Protocol\ServerException;
+use PHPUnit\Framework\TestCase;
 
-class ServerExceptionTest extends \PHPUnit\Framework\TestCase
+class ServerExceptionTest extends TestCase
 {
     public const RESPONSE_WITH_WARNINGS = "HNHBK:1:3+000000000489+300+0+1+0:1'HIRMG:2:2:+3060::Teilweise liegen Warnungen/Hinweise vor.'HIRMS:3:2:3+0020::Angemeldet.+3076::Keine starke Authentifizierung erforderlich.+0901::PIN gultig.'HIRMS:4:2:4+0020::Informationen fehlerfrei entgegengenommen.+3920::Zugelassene Ein- und Zwei-Schritt-Verfahren fur den Benutzer:900'HIRMS:5:2:6+0020::Die Synchronisierung der Kundensystem-ID war erfolgreich.'HISYN:6:4:6+111111111111111111111111111111'HITAN:7:6:5+4++noref+nochallenge'HNHBS:8:1+1'";
     public const RESPONSE_WITH_ERRORS = "HNHBK:1:3+000000000164+300+0+1+0:1'HIRMG:2:2:+9800::Der Dialog wurde abgebrochen.+9010::Unerwartete Nachrichtennummer. Bitte melden Sie sich erneut an.'HNHBS:3:1+1'";
diff --git a/lib/Tests/Fhp/Segment/AnonymousSegmentTest.php b/Tests/Unit/Segment/AnonymousSegmentTest.php
similarity index 97%
rename from lib/Tests/Fhp/Segment/AnonymousSegmentTest.php
rename to Tests/Unit/Segment/AnonymousSegmentTest.php
index dbabdfa9..2dabeabb 100644
--- a/lib/Tests/Fhp/Segment/AnonymousSegmentTest.php
+++ b/Tests/Unit/Segment/AnonymousSegmentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\AnonymousSegment;
 use Fhp\Syntax\Parser;
diff --git a/lib/Tests/Fhp/Segment/Common/TspTest.php b/Tests/Unit/Segment/Common/TspTest.php
similarity index 93%
rename from lib/Tests/Fhp/Segment/Common/TspTest.php
rename to Tests/Unit/Segment/Common/TspTest.php
index 6f0e1d9d..42215ff4 100644
--- a/lib/Tests/Fhp/Segment/Common/TspTest.php
+++ b/Tests/Unit/Segment/Common/TspTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment\Common;
+namespace Fhp\Tests\Unit\Segment\Common;
 
 use Fhp\Segment\Common\Tsp;
 
diff --git a/lib/Tests/Fhp/Segment/FindRueckmeldungTraitTest.php b/Tests/Unit/Segment/FindRueckmeldungTraitTest.php
similarity index 98%
rename from lib/Tests/Fhp/Segment/FindRueckmeldungTraitTest.php
rename to Tests/Unit/Segment/FindRueckmeldungTraitTest.php
index 3b9ce9ab..5664522f 100644
--- a/lib/Tests/Fhp/Segment/FindRueckmeldungTraitTest.php
+++ b/Tests/Unit/Segment/FindRueckmeldungTraitTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Protocol\Message;
 use Fhp\Protocol\MessageBuilder;
diff --git a/lib/Tests/Fhp/Segment/HICAZTest.php b/Tests/Unit/Segment/HICAZTest.php
similarity index 99%
rename from lib/Tests/Fhp/Segment/HICAZTest.php
rename to Tests/Unit/Segment/HICAZTest.php
index 54e61d9c..0550dde6 100644
--- a/lib/Tests/Fhp/Segment/HICAZTest.php
+++ b/Tests/Unit/Segment/HICAZTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\CAZ\HICAZv1;
 
diff --git a/lib/Tests/Fhp/Segment/HISALTest.php b/Tests/Unit/Segment/HISALTest.php
similarity index 96%
rename from lib/Tests/Fhp/Segment/HISALTest.php
rename to Tests/Unit/Segment/HISALTest.php
index 5294a5bd..f3d72c93 100644
--- a/lib/Tests/Fhp/Segment/HISALTest.php
+++ b/Tests/Unit/Segment/HISALTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\Common\Kti;
 use Fhp\Segment\Common\Sdo;
diff --git a/lib/Tests/Fhp/Segment/HITABTest.php b/Tests/Unit/Segment/HITABTest.php
similarity index 97%
rename from lib/Tests/Fhp/Segment/HITABTest.php
rename to Tests/Unit/Segment/HITABTest.php
index 51fb7755..0d5bee01 100644
--- a/lib/Tests/Fhp/Segment/HITABTest.php
+++ b/Tests/Unit/Segment/HITABTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\TAB\HITABv4;
 
diff --git a/lib/Tests/Fhp/Segment/HITANSTest.php b/Tests/Unit/Segment/HITANSTest.php
similarity index 99%
rename from lib/Tests/Fhp/Segment/HITANSTest.php
rename to Tests/Unit/Segment/HITANSTest.php
index 2899c343..556ab21e 100644
--- a/lib/Tests/Fhp/Segment/HITANSTest.php
+++ b/Tests/Unit/Segment/HITANSTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\BaseSegment;
 use Fhp\Segment\TAN\HITANSv6;
diff --git a/lib/Tests/Fhp/Segment/HIUPATest.php b/Tests/Unit/Segment/HIUPATest.php
similarity index 92%
rename from lib/Tests/Fhp/Segment/HIUPATest.php
rename to Tests/Unit/Segment/HIUPATest.php
index 5a281d9b..41e28988 100644
--- a/lib/Tests/Fhp/Segment/HIUPATest.php
+++ b/Tests/Unit/Segment/HIUPATest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\HIUPA\HIUPAv4;
 
diff --git a/lib/Tests/Fhp/Segment/HIUPDTest.php b/Tests/Unit/Segment/HIUPDTest.php
similarity index 99%
rename from lib/Tests/Fhp/Segment/HIUPDTest.php
rename to Tests/Unit/Segment/HIUPDTest.php
index 3b09d6ff..089d2b2f 100644
--- a/lib/Tests/Fhp/Segment/HIUPDTest.php
+++ b/Tests/Unit/Segment/HIUPDTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\HIUPD\HIUPDv4;
 
diff --git a/lib/Tests/Fhp/Segment/HIVPPSTest.php b/Tests/Unit/Segment/HIVPPSTest.php
similarity index 98%
rename from lib/Tests/Fhp/Segment/HIVPPSTest.php
rename to Tests/Unit/Segment/HIVPPSTest.php
index 54cbf19d..7c2833c0 100644
--- a/lib/Tests/Fhp/Segment/HIVPPSTest.php
+++ b/Tests/Unit/Segment/HIVPPSTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\VPP\HIVPPSv1;
 use Fhp\Segment\VPP\ParameterNamensabgleichPruefauftragV1;
diff --git a/lib/Tests/Fhp/Segment/HKCCSTest.php b/Tests/Unit/Segment/HKCCSTest.php
similarity index 95%
rename from lib/Tests/Fhp/Segment/HKCCSTest.php
rename to Tests/Unit/Segment/HKCCSTest.php
index 141980c7..136a5574 100644
--- a/lib/Tests/Fhp/Segment/HKCCSTest.php
+++ b/Tests/Unit/Segment/HKCCSTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\CCS\HKCCSv1;
 use PHPUnit\Framework\TestCase;
diff --git a/lib/Tests/Fhp/Segment/HKSPATest.php b/Tests/Unit/Segment/HKSPATest.php
similarity index 92%
rename from lib/Tests/Fhp/Segment/HKSPATest.php
rename to Tests/Unit/Segment/HKSPATest.php
index bd79fc3a..28b355a8 100644
--- a/lib/Tests/Fhp/Segment/HKSPATest.php
+++ b/Tests/Unit/Segment/HKSPATest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\SPA\HKSPAv2;
 use PHPUnit\Framework\TestCase;
diff --git a/lib/Tests/Fhp/Segment/HKVPPTest.php b/Tests/Unit/Segment/HKVPPTest.php
similarity index 96%
rename from lib/Tests/Fhp/Segment/HKVPPTest.php
rename to Tests/Unit/Segment/HKVPPTest.php
index 99ab2814..d1b22f89 100644
--- a/lib/Tests/Fhp/Segment/HKVPPTest.php
+++ b/Tests/Unit/Segment/HKVPPTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\VPP\HKVPPv1;
 use Fhp\Syntax\Parser;
diff --git a/lib/Tests/Fhp/Segment/HNVSDTest.php b/Tests/Unit/Segment/HNVSDTest.php
similarity index 98%
rename from lib/Tests/Fhp/Segment/HNVSDTest.php
rename to Tests/Unit/Segment/HNVSDTest.php
index edc1d7f4..e71cfa8e 100644
--- a/lib/Tests/Fhp/Segment/HNVSDTest.php
+++ b/Tests/Unit/Segment/HNVSDTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\HNVSD\HNVSDv1;
 use PHPUnit\Framework\TestCase;
diff --git a/lib/Tests/Fhp/Segment/HNVSKTest.php b/Tests/Unit/Segment/HNVSKTest.php
similarity index 98%
rename from lib/Tests/Fhp/Segment/HNVSKTest.php
rename to Tests/Unit/Segment/HNVSKTest.php
index d689263a..6088aa22 100644
--- a/lib/Tests/Fhp/Segment/HNVSKTest.php
+++ b/Tests/Unit/Segment/HNVSKTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Options\Credentials;
 use Fhp\Options\FinTsOptions;
diff --git a/lib/Tests/Fhp/Segment/SegmentComparator.php b/Tests/Unit/Segment/SegmentComparator.php
similarity index 95%
rename from lib/Tests/Fhp/Segment/SegmentComparator.php
rename to Tests/Unit/Segment/SegmentComparator.php
index 20152d72..2570bc3c 100644
--- a/lib/Tests/Fhp/Segment/SegmentComparator.php
+++ b/Tests/Unit/Segment/SegmentComparator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\BaseDeg;
 use Fhp\Segment\BaseSegment;
diff --git a/lib/Tests/Fhp/Segment/UpdSerializationTest.php b/Tests/Unit/Segment/UpdSerializationTest.php
similarity index 98%
rename from lib/Tests/Fhp/Segment/UpdSerializationTest.php
rename to Tests/Unit/Segment/UpdSerializationTest.php
index 8df47a6a..8ec82524 100644
--- a/lib/Tests/Fhp/Segment/UpdSerializationTest.php
+++ b/Tests/Unit/Segment/UpdSerializationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Fhp\Segment;
+namespace Fhp\Tests\Unit\Segment;
 
 use Fhp\Segment\HIUPD\HIUPDv6;
 use Fhp\Syntax\Parser;
diff --git a/lib/Tests/Fhp/Unit/SendSEPADirectDebitTest.php b/Tests/Unit/SendSEPADirectDebitTest.php
similarity index 71%
rename from lib/Tests/Fhp/Unit/SendSEPADirectDebitTest.php
rename to Tests/Unit/SendSEPADirectDebitTest.php
index f92c4a84..f439c9a7 100644
--- a/lib/Tests/Fhp/Unit/SendSEPADirectDebitTest.php
+++ b/Tests/Unit/SendSEPADirectDebitTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Tests\Fhp\Unit;
+namespace Fhp\Tests\Unit;
 
 use Fhp\Action\SendSEPADirectDebit;
 use Fhp\Model\SEPAAccount;
-use Tests\Fhp\FinTsTestCase;
 
 class SendSEPADirectDebitTest extends FinTsTestCase
 {
@@ -12,7 +11,7 @@ public function testCanSendLargeFiles()
     {
         $account = new SEPAAccount();
 
-        $painString = file_get_contents(__DIR__ . '/../../resources/pain.008.002.02.xml');
+        $painString = file_get_contents(__DIR__ . '/../resources/pain.008.002.02.xml');
 
         $sepa = SendSEPADirectDebit::create($account, $painString);
 
diff --git a/lib/Tests/Fhp/Syntax/BinTest.php b/Tests/Unit/Syntax/BinTest.php
similarity index 94%
rename from lib/Tests/Fhp/Syntax/BinTest.php
rename to Tests/Unit/Syntax/BinTest.php
index 0bb1a036..e748d964 100644
--- a/lib/Tests/Fhp/Syntax/BinTest.php
+++ b/Tests/Unit/Syntax/BinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Syntax;
+namespace Fhp\Tests\Unit\Syntax;
 
 use Fhp\Syntax\Bin;
 
diff --git a/lib/Tests/Fhp/Syntax/ParserTest.php b/Tests/Unit/Syntax/ParserTest.php
similarity index 99%
rename from lib/Tests/Fhp/Syntax/ParserTest.php
rename to Tests/Unit/Syntax/ParserTest.php
index bea7b58b..f8e2025b 100644
--- a/lib/Tests/Fhp/Syntax/ParserTest.php
+++ b/Tests/Unit/Syntax/ParserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fhp\Syntax;
+namespace Fhp\Tests\Unit\Syntax;
 
 use Fhp\Syntax\Parser;
 
diff --git a/lib/Tests/Fhp/Syntax/SerializerTest.php b/Tests/Unit/Syntax/SerializerTest.php
similarity index 98%
rename from lib/Tests/Fhp/Syntax/SerializerTest.php
rename to Tests/Unit/Syntax/SerializerTest.php
index 2b131c7f..3d59dca6 100644
--- a/lib/Tests/Fhp/Syntax/SerializerTest.php
+++ b/Tests/Unit/Syntax/SerializerTest.php
@@ -1,7 +1,7 @@
 <?php
 /** @noinspection PhpDocSignatureInspection */
 
-namespace Tests\Fhp\Syntax;
+namespace Fhp\Tests\Unit\Syntax;
 
 use Fhp\Syntax\Serializer;
 
diff --git a/lib/Tests/phpunit_bootstrap.php b/Tests/phpunit_bootstrap.php
similarity index 70%
rename from lib/Tests/phpunit_bootstrap.php
rename to Tests/phpunit_bootstrap.php
index 9c694c71..889dcaf2 100644
--- a/lib/Tests/phpunit_bootstrap.php
+++ b/Tests/phpunit_bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
+use Fhp\Tests\Unit\Segment\SegmentComparator;
 use SebastianBergmann\Comparator\Factory;
-use Tests\Fhp\Segment\SegmentComparator;
 
 Factory::getInstance()->register(new SegmentComparator());
diff --git a/lib/Tests/resources/pain.008.002.02.xml b/Tests/resources/pain.008.002.02.xml
similarity index 100%
rename from lib/Tests/resources/pain.008.002.02.xml
rename to Tests/resources/pain.008.002.02.xml
diff --git a/composer.json b/composer.json
index 08e40202..ec8c9c4a 100644
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,12 @@
   "license": "MIT",
   "autoload": {
     "psr-0": {
-      "Fhp": "lib/",
-      "Tests\\Fhp": "lib/"
+      "Fhp": "lib/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Fhp\\Tests\\": "Tests/"
     }
   },
   "require": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 82e780f0..2a08cf1b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,8 +8,8 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         bootstrap="./lib/Tests/phpunit_bootstrap.php"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+         bootstrap="./Tests/phpunit_bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
   <coverage processUncoveredFiles="true">
     <include>
       <directory suffix=".php">./lib/Fhp/</directory>
@@ -17,7 +17,7 @@
   </coverage>
   <testsuites>
     <testsuite name="FHP Test Suite">
-      <directory>./lib/Tests/Fhp/</directory>
+      <directory>Tests/Unit/</directory>
     </testsuite>
   </testsuites>
 </phpunit>