diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a384886f..e427b11c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0']
+        php-versions: ['8.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -81,4 +81,4 @@ jobs:
         continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
       - name: Running PHP_CodeSniffer
         run: vendor/bin/phpcs --standard=config/PhpCodeSniffer/ bin/ src/ tests/ public/;
-        continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
\ No newline at end of file
+        continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
diff --git a/composer.json b/composer.json
index a0b45ebb..7caac56e 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,8 @@
         "nette/caching": "^3.0.0",
         "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
-        "symfony/test-pack": "^1.1"
+        "symfony/test-pack": "^1.1",
+        "symfony/process": "^6.4"
     },
     "suggest": {
         "phplist/web-frontend": "5.0.x-dev",
diff --git a/src/Domain/Model/Subscription/Subscriber.php b/src/Domain/Model/Subscription/Subscriber.php
index cd2e452b..ec083e6a 100644
--- a/src/Domain/Model/Subscription/Subscriber.php
+++ b/src/Domain/Model/Subscription/Subscriber.php
@@ -82,8 +82,8 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     private ?string $extraData;
 
     #[ORM\OneToMany(
-        mappedBy: "subscriber",
         targetEntity: "PhpList\Core\Domain\Model\Subscription\Subscription",
+        mappedBy: "subscriber",
         cascade: ["remove"]
     )]
     private Collection $subscriptions;
diff --git a/tests/Integration/Domain/Repository/Fixtures/AdministratorFixture.php b/tests/Integration/Domain/Repository/Fixtures/AdministratorFixture.php
index 13ae9261..7376b8b7 100644
--- a/tests/Integration/Domain/Repository/Fixtures/AdministratorFixture.php
+++ b/tests/Integration/Domain/Repository/Fixtures/AdministratorFixture.php
@@ -11,9 +11,6 @@
 use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
-/**
- * @author Tatevik Grigoryan <tatevik@phplist.com>
- */
 class AdministratorFixture extends Fixture
 {
     use ModelTestTrait;
diff --git a/tests/Integration/Domain/Repository/Fixtures/AdministratorTokenWithAdministratorFixture.php b/tests/Integration/Domain/Repository/Fixtures/AdministratorTokenWithAdministratorFixture.php
index 7f65d18d..cf609746 100644
--- a/tests/Integration/Domain/Repository/Fixtures/AdministratorTokenWithAdministratorFixture.php
+++ b/tests/Integration/Domain/Repository/Fixtures/AdministratorTokenWithAdministratorFixture.php
@@ -12,9 +12,7 @@
 use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
-/**
- * @author Tatevik Grigoryan <tatevik@phplist.com>
- */
+
 class AdministratorTokenWithAdministratorFixture extends Fixture
 {
     use ModelTestTrait;
diff --git a/tests/Integration/Domain/Repository/Fixtures/DetachedAdministratorTokenFixture.php b/tests/Integration/Domain/Repository/Fixtures/DetachedAdministratorTokenFixture.php
index be9462cb..617c43db 100644
--- a/tests/Integration/Domain/Repository/Fixtures/DetachedAdministratorTokenFixture.php
+++ b/tests/Integration/Domain/Repository/Fixtures/DetachedAdministratorTokenFixture.php
@@ -11,9 +11,6 @@
 use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
-/**
- * @author Tatevik Grigoryan <tatevik@phplist.com>
- */
 class DetachedAdministratorTokenFixture extends Fixture
 {
     use ModelTestTrait;
diff --git a/tests/Integration/Domain/Repository/Fixtures/SubscriberFixture.php b/tests/Integration/Domain/Repository/Fixtures/SubscriberFixture.php
index 8b164681..8df21985 100644
--- a/tests/Integration/Domain/Repository/Fixtures/SubscriberFixture.php
+++ b/tests/Integration/Domain/Repository/Fixtures/SubscriberFixture.php
@@ -6,17 +6,12 @@
 
 use DateTime;
 use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\DBAL\Connection;
 use Doctrine\Persistence\ObjectManager;
-use PhpList\Core\Domain\Model\Subscription\Subscriber;
-use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
-/**
- * @author Tatevik Grigoryan <tatevik@phplist.com>
- */
 class SubscriberFixture extends Fixture
 {
-    use ModelTestTrait;
     public function load(ObjectManager $manager): void
     {
         $csvFile = __DIR__ . '/Subscriber.csv';
@@ -31,26 +26,43 @@ public function load(ObjectManager $manager): void
         }
 
         $headers = fgetcsv($handle);
+        if ($headers === false) {
+            throw new RuntimeException('Could not read headers from CSV file.');
+        }
+
+        /** @var Connection $connection */
+        $connection = $manager->getConnection();
+
+        $insertQuery = "
+            INSERT INTO phplist_user_user (
+                id, entered, modified, email, confirmed, blacklisted, bouncecount,
+                uniqid, htmlemail, disabled, extradata
+            ) VALUES (
+                :id, :creation_date, :modification_date, :email, :confirmed, :blacklisted, :bounce_count,
+                :unique_id, :html_email, :disabled, :extra_data
+            )
+        ";
+
+        $stmt = $connection->prepare($insertQuery);
 
         while (($data = fgetcsv($handle)) !== false) {
             $row = array_combine($headers, $data);
 
-            $subscriber = new Subscriber();
-            $this->setSubjectId($subscriber,(int)$row['id']);
-            $this->setSubjectProperty($subscriber,'creationDate', new DateTime($row['entered']));
-            $this->setSubjectProperty($subscriber,'modificationDate', new DateTime($row['modified']));
-            $subscriber->setEmail($row['email']);
-            $subscriber->setConfirmed((bool) $row['confirmed']);
-            $subscriber->setBlacklisted((bool) $row['blacklisted']);
-            $subscriber->setBounceCount((int) $row['bouncecount']);
-            $subscriber->setUniqueId($row['uniqueid']);
-            $subscriber->setHtmlEmail((bool) $row['htmlemail']);
-            $subscriber->setDisabled((bool) $row['disabled']);
-            $subscriber->setExtraData($row['extradata']);
-            $manager->persist($subscriber);
+            $stmt->executeStatement([
+                'id' => (int) $row['id'],
+                'creation_date' => (new DateTime($row['entered']))->format('Y-m-d H:i:s'),
+                'modification_date' => (new DateTime($row['modified']))->format('Y-m-d H:i:s'),
+                'email' => $row['email'],
+                'confirmed' => (bool) $row['confirmed'] ? 1 : 0,
+                'blacklisted' => (bool) $row['blacklisted'] ? 1 : 0,
+                'bounce_count' => (int) $row['bouncecount'],
+                'unique_id' => $row['uniqueid'],
+                'html_email' => (bool) $row['htmlemail'] ? 1 : 0,
+                'disabled' => (bool) $row['disabled'] ? 1 : 0,
+                'extra_data' => $row['extradata'],
+            ]);
         }
 
         fclose($handle);
-        $manager->flush();
     }
 }
diff --git a/tests/Integration/Domain/Repository/Fixtures/SubscriberListFixture.php b/tests/Integration/Domain/Repository/Fixtures/SubscriberListFixture.php
index 4a52de2b..73ccfff7 100644
--- a/tests/Integration/Domain/Repository/Fixtures/SubscriberListFixture.php
+++ b/tests/Integration/Domain/Repository/Fixtures/SubscriberListFixture.php
@@ -12,9 +12,6 @@
 use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
-/**
- * @author Tatevik Grigoryan <tatevik@phplist.com>
- */
 class SubscriberListFixture extends Fixture
 {
     use ModelTestTrait;
@@ -52,10 +49,9 @@ public function load(ObjectManager $manager): void
 
             $manager->persist($admin);
             $manager->persist($subscriberList);
-            $this->setSubjectProperty($subscriberList,'creationDate', new DateTime($row['entered']));
+            $manager->flush();
         }
 
         fclose($handle);
-        $manager->flush();
     }
 }
diff --git a/tests/Integration/Domain/Repository/Fixtures/SubscriptionFixture.php b/tests/Integration/Domain/Repository/Fixtures/SubscriptionFixture.php
index 81525c97..89f00b92 100644
--- a/tests/Integration/Domain/Repository/Fixtures/SubscriptionFixture.php
+++ b/tests/Integration/Domain/Repository/Fixtures/SubscriptionFixture.php
@@ -6,19 +6,12 @@
 
 use DateTime;
 use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\DBAL\Connection;
 use Doctrine\Persistence\ObjectManager;
-use PhpList\Core\Domain\Model\Messaging\SubscriberList;
-use PhpList\Core\Domain\Model\Subscription\Subscriber;
-use PhpList\Core\Domain\Model\Subscription\Subscription;
-use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
-/**
- * @author Tatevik Grigoryan <tatevik@phplist.com>
- */
 class SubscriptionFixture extends Fixture
 {
-    use ModelTestTrait;
     public function load(ObjectManager $manager): void
     {
         $csvFile = __DIR__ . '/Subscription.csv';
@@ -33,27 +26,34 @@ public function load(ObjectManager $manager): void
         }
 
         $headers = fgetcsv($handle);
+        if ($headers === false) {
+            throw new RuntimeException('Could not read headers from CSV file.');
+        }
 
-        while (($data = fgetcsv($handle)) !== false) {
-            $row = array_combine($headers, $data);
+        /** @var Connection $connection */
+        $connection = $manager->getConnection();
 
-            $subscriber = new Subscriber();
-            $this->setSubjectId($subscriber,(int)$row['userid']);
-            $manager->persist($subscriber);
+        $insertSubscriptionQuery = "
+            INSERT INTO phplist_listuser (
+                userid, listid, entered, modified
+            ) VALUES (
+                :subscriber_id, :subscriber_list_id, :creation_date, :modification_date
+            )
+        ";
 
-            $subscriberList = new SubscriberList();
-            $this->setSubjectId($subscriberList,(int)$row['listid']);
-            $manager->persist($subscriberList);
+        $subscriptionStmt = $connection->prepare($insertSubscriptionQuery);
+
+        while (($data = fgetcsv($handle)) !== false) {
+            $row = array_combine($headers, $data);
 
-            $subscription = new Subscription();
-            $this->setSubjectProperty($subscription,'subscriber', $subscriber);
-            $this->setSubjectProperty($subscription,'subscriberList', $subscriberList);
-            $this->setSubjectProperty($subscription,'creationDate', new DateTime($row['entered']));
-            $this->setSubjectProperty($subscription,'modificationDate', new DateTime($row['modified']));
-            $manager->persist($subscription);
+            $subscriptionStmt->executeStatement([
+                'subscriber_id' => (int) $row['userid'],
+                'subscriber_list_id' => (int) $row['listid'],
+                'creation_date' => (new DateTime($row['entered']))->format('Y-m-d H:i:s'),
+                'modification_date' => (new DateTime($row['modified']))->format('Y-m-d H:i:s'),
+            ]);
         }
 
         fclose($handle);
-        $manager->flush();
     }
 }
diff --git a/tests/Integration/Domain/Repository/Identity/AdministratorRepositoryTest.php b/tests/Integration/Domain/Repository/Identity/AdministratorRepositoryTest.php
index cf10017d..6ea5e13a 100644
--- a/tests/Integration/Domain/Repository/Identity/AdministratorRepositoryTest.php
+++ b/tests/Integration/Domain/Repository/Identity/AdministratorRepositoryTest.php
@@ -17,7 +17,6 @@
  * Testcase.
  *
  * @author Oliver Klee <oliver@phplist.com>
- * @author Tatevik Grigoryan <tatevik@phplist.com>
  */
 class AdministratorRepositoryTest extends KernelTestCase
 {
diff --git a/tests/Integration/Domain/Repository/Identity/AdministratorTokenRepositoryTest.php b/tests/Integration/Domain/Repository/Identity/AdministratorTokenRepositoryTest.php
index 7b5f134e..0961f055 100644
--- a/tests/Integration/Domain/Repository/Identity/AdministratorTokenRepositoryTest.php
+++ b/tests/Integration/Domain/Repository/Identity/AdministratorTokenRepositoryTest.php
@@ -20,7 +20,6 @@
  * Testcase.
  *
  * @author Oliver Klee <oliver@phplist.com>
- * @author Tatevik Grigoryan <tatevik@phplist.com>
  */
 class AdministratorTokenRepositoryTest extends KernelTestCase
 {
diff --git a/tests/Integration/Domain/Repository/Messaging/SubscriberListRepositoryTest.php b/tests/Integration/Domain/Repository/Messaging/SubscriberListRepositoryTest.php
index 9e03d93e..f505884d 100644
--- a/tests/Integration/Domain/Repository/Messaging/SubscriberListRepositoryTest.php
+++ b/tests/Integration/Domain/Repository/Messaging/SubscriberListRepositoryTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void
         parent::setUp();
         $this->loadSchema();
 
-        $this->subject = self::getContainer()->get(SubscriberListRepository::class);
+        $this->subscriberListRepository = self::getContainer()->get(SubscriberListRepository::class);
         $this->administratorRepository = self::getContainer()->get(AdministratorRepository::class);
         $this->subscriberRepository = self::getContainer()->get(SubscriberRepository::class);
         $this->subscriptionRepository = self::getContainer()->get(SubscriptionRepository::class);
@@ -59,7 +59,7 @@ public function testFindReadsModelFromDatabase()
         $this->loadFixtures([SubscriberListFixture::class]);
 
         $id = 1;
-        $creationDate = new DateTime('2016-06-22 15:01:17');
+        $creationDate = new DateTime();
         $modificationDate = new DateTime();
         $name = 'News';
         $description = 'News (and some fun stuff)';
@@ -68,7 +68,7 @@ public function testFindReadsModelFromDatabase()
         $category = 'news';
 
         /** @var SubscriberList $model */
-        $model = $this->subject->find($id);
+        $model = $this->subscriberListRepository->find($id);
 
         self::assertSame($id, $model->getId());
         self::assertSimilarDates($creationDate, $model->getCreationDate());
@@ -88,7 +88,7 @@ public function testCreatesOwnerAssociationAsProxy()
         $subscriberListId = 1;
         $ownerId = 1;
         /** @var SubscriberList $model */
-        $model = $this->subject->find($subscriberListId);
+        $model = $this->subscriberListRepository->find($subscriberListId);
         $owner = $model->getOwner();
 
         self::assertInstanceOf(Administrator::class, $owner);
@@ -119,9 +119,9 @@ public function testModificationDateOfNewModelIsSetToNowOnPersist()
     public function testSavePersistsAndFlushesModel()
     {
         $model = new SubscriberList();
-        $this->subject->save($model);
+        $this->subscriberListRepository->save($model);
 
-        self::assertSame($model, $this->subject->find($model->getId()));
+        self::assertSame($model, $this->subscriberListRepository->find($model->getId()));
     }
 
     public function testFindByOwnerFindsSubscriberListWithTheGivenOwner()
@@ -129,9 +129,9 @@ public function testFindByOwnerFindsSubscriberListWithTheGivenOwner()
         $this->loadFixtures([SubscriberListFixture::class, AdministratorFixture::class]);
 
         $owner = $this->administratorRepository->find(1);
-        $ownedList = $this->subject->find(1);
+        $ownedList = $this->subscriberListRepository->find(1);
 
-        $result = $this->subject->findByOwner($owner);
+        $result = $this->subscriberListRepository->findByOwner($owner);
 
         self::assertContains($ownedList, $result);
     }
@@ -141,32 +141,32 @@ public function testFindByOwnerIgnoresSubscriberListWithOtherOwner()
         $this->loadFixtures([SubscriberListFixture::class, AdministratorFixture::class]);
 
         $owner = $this->administratorRepository->find(1);
-        $foreignList = $this->subject->find(2);
+        $foreignList = $this->subscriberListRepository->find(2);
 
-        $result = $this->subject->findByOwner($owner);
+        $result = $this->subscriberListRepository->findByOwner($owner);
 
         self::assertNotContains($foreignList, $result);
     }
 
     public function testFindByOwnerIgnoresSubscriberListFromOtherOwner()
     {
-        $this->loadFixtures([SubscriberListFixture::class, AdministratorFixture::class]);
+        $this->loadFixtures([SubscriberListFixture::class]);
 
         $owner = $this->administratorRepository->find(1);
-        $unownedList = $this->subject->find(3);
+        $unownedList = $this->subscriberListRepository->find(3);
 
-        $result = $this->subject->findByOwner($owner);
+        $result = $this->subscriberListRepository->findByOwner($owner);
 
         self::assertNotContains($unownedList, $result);
     }
 
     public function testFindsAssociatedSubscriptions()
     {
-        $this->loadFixtures([SubscriberListFixture::class, SubscriberFixture::class, SubscriptionFixture::class]);
+        $this->loadFixtures([SubscriptionFixture::class]);
 
         $id = 2;
         /** @var SubscriberList $model */
-        $model = $this->subject->find($id);
+        $model = $this->subscriberListRepository->find($id);
         $subscriptions = $model->getSubscriptions();
 
         self::assertFalse($subscriptions->isEmpty());
@@ -183,7 +183,7 @@ public function testFindsAssociatedSubscribers()
 
         $id = 2;
         /** @var SubscriberList $model */
-        $model = $this->subject->find($id);
+        $model = $this->subscriberListRepository->find($id);
         $subscribers = $model->getSubscribers();
 
         $expectedSubscriber = $this->subscriberRepository->find(1);
@@ -200,12 +200,12 @@ public function testRemoveAlsoRemovesAssociatedSubscriptions()
 
         $id = 2;
         /** @var SubscriberList $model */
-        $model = $this->subject->find($id);
+        $model = $this->subscriberListRepository->find($id);
 
         $numberOfAssociatedSubscriptions = count($model->getSubscriptions());
         self::assertGreaterThan(0, $numberOfAssociatedSubscriptions);
 
-        $this->subject->remove($model);
+        $this->subscriberListRepository->remove($model);
 
         $newNumberOfSubscriptions = count($this->subscriptionRepository->findAll());
         $numberOfRemovedSubscriptions = $initialNumberOfSubscriptions - $newNumberOfSubscriptions;
@@ -217,13 +217,13 @@ public function testRemoveRemovesModel()
         $this->loadFixtures([SubscriberListFixture::class]);
 
         /** @var SubscriberList[] $allModels */
-        $allModels = $this->subject->findAll();
+        $allModels = $this->subscriberListRepository->findAll();
         $numberOfModelsBeforeRemove = count($allModels);
         $firstModel = $allModels[0];
 
-        $this->subject->remove($firstModel);
+        $this->subscriberListRepository->remove($firstModel);
 
-        $numberOfModelsAfterRemove = count($this->subject->findAll());
+        $numberOfModelsAfterRemove = count($this->subscriberListRepository->findAll());
         self::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);
     }
 }
diff --git a/tests/Integration/Domain/Repository/Subscription/SubscriberRepositoryTest.php b/tests/Integration/Domain/Repository/Subscription/SubscriberRepositoryTest.php
index 40363123..5e242874 100644
--- a/tests/Integration/Domain/Repository/Subscription/SubscriberRepositoryTest.php
+++ b/tests/Integration/Domain/Repository/Subscription/SubscriberRepositoryTest.php
@@ -4,155 +4,114 @@
 
 namespace PhpList\Core\Tests\Integration\Domain\Repository\Subscription;
 
+use DateTime;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Model\Subscription\Subscription;
 use PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriptionRepository;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberFixture;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberListFixture;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriptionFixture;
 use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
 use PhpList\Core\Tests\TestingSupport\Traits\SimilarDatesAssertionTrait;
-use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * Testcase.
  *
  * @author Oliver Klee <oliver@phplist.com>
  */
-class SubscriberRepositoryTest extends TestCase
+class SubscriberRepositoryTest extends KernelTestCase
 {
     use DatabaseTestTrait;
     use SimilarDatesAssertionTrait;
 
-    /**
-     * @var string
-     */
-    const TABLE_NAME = 'phplist_user_user';
-
-    /**
-     * @var string
-     */
-    const ADMINISTRATOR_TABLE_NAME = 'phplist_admin';
-
-    /**
-     * @var string
-     */
-    const SUBSCRIPTION_TABLE_NAME = 'phplist_listuser';
+    private ?SubscriberRepository $subscriberRepository = null;
+    private ?SubscriberListRepository $subscriberListRepository = null;
+    private ?SubscriptionRepository $subscriptionRepository = null;
 
-    /**
-     * @var string
-     */
-    const SUBSCRIBER_LIST_TABLE_NAME = 'phplist_list';
-
-    /**
-     * @var SubscriberRepository
-     */
-    private $subject = null;
-
-    /**
-     * @var SubscriberListRepository
-     */
-    private $subscriberListRepository = null;
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->loadSchema();
 
-    /**
-     * @var SubscriptionRepository
-     */
-    private $subscriptionRepository = null;
+        $this->subscriberRepository = self::getContainer()->get(SubscriberRepository::class);
+        $this->subscriberListRepository = self::getContainer()->get(SubscriberListRepository::class);
+        $this->subscriptionRepository = self::getContainer()->get(SubscriptionRepository::class);
+    }
 
-    protected function setUp()
+    protected function tearDown(): void
     {
-        $this->setUpDatabaseTest();
-
-        $this->subject = $this->container->get(SubscriberRepository::class);
-        $this->subscriberListRepository = $this->container->get(SubscriberListRepository::class);
-        $this->subscriptionRepository = $this->container->get(SubscriptionRepository::class);
+        $schemaTool = new SchemaTool($this->entityManager);
+        $schemaTool->dropDatabase();
+        parent::tearDown();
     }
 
-    /**
-     * @test
-     */
-    public function findReadsModelFromDatabase()
+    public function testFindReadsModelFromDatabase()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class]);
 
         $id = 1;
-        $creationDate = new \DateTime('2016-07-22 15:01:17');
-        $modificationDate = new \DateTime('2016-08-23 19:50:43');
+        $creationDate = new DateTime('2016-07-22 15:01:17');
+        $modificationDate = new DateTime('2016-08-23 19:50:43');
         $extraData = 'This is one of our favourite subscribers.';
 
         /** @var Subscriber $model */
-        $model = $this->subject->find($id);
-
-        static::assertSame($id, $model->getId());
-        static::assertEquals($creationDate, $model->getCreationDate());
-        static::assertEquals($modificationDate, $model->getModificationDate());
-        static::assertEquals('oliver@example.com', $model->getEmail());
-        static::assertTrue($model->isConfirmed());
-        static::assertTrue($model->isBlacklisted());
-        static::assertSame(17, $model->getBounceCount());
-        static::assertSame('95feb7fe7e06e6c11ca8d0c48cb46e89', $model->getUniqueId());
-        static::assertTrue($model->hasHtmlEmail());
-        static::assertTrue($model->isDisabled());
-        static::assertSame($extraData, $model->getExtraData());
+        $model = $this->subscriberRepository->find($id);
+
+        self::assertSame($id, $model->getId());
+        self::assertSimilarDates($creationDate, $model->getCreationDate());
+        self::assertSimilarDates($modificationDate, $model->getModificationDate());
+        self::assertEquals('oliver@example.com', $model->getEmail());
+        self::assertTrue($model->isConfirmed());
+        self::assertTrue($model->isBlacklisted());
+        self::assertSame(17, $model->getBounceCount());
+        self::assertSame('95feb7fe7e06e6c11ca8d0c48cb46e89', $model->getUniqueId());
+        self::assertTrue($model->hasHtmlEmail());
+        self::assertTrue($model->isDisabled());
+        self::assertSame($extraData, $model->getExtraData());
     }
 
-    /**
-     * @test
-     */
-    public function creationDateOfNewModelIsSetToNowOnPersist()
+    public function testCreationDateOfNewModelIsSetToNowOnPersist()
     {
-        $this->touchDatabaseTable(static::TABLE_NAME);
-
         $model = new Subscriber();
         $model->setEmail('sam@example.com');
-        $expectedCreationDate = new \DateTime();
+        $expectedCreationDate = new DateTime();
 
         $this->entityManager->persist($model);
 
-        static::assertSimilarDates($expectedCreationDate, $model->getCreationDate());
+        self::assertSimilarDates($expectedCreationDate, $model->getCreationDate());
     }
 
-    /**
-     * @test
-     */
-    public function modificationDateOfNewModelIsSetToNowOnPersist()
+    public function testModificationDateOfNewModelIsSetToNowOnPersist()
     {
-        $this->touchDatabaseTable(static::TABLE_NAME);
-
         $model = new Subscriber();
         $model->setEmail('oliver@example.com');
-        $expectedModificationDate = new \DateTime();
+        $expectedModificationDate = new DateTime();
 
         $this->entityManager->persist($model);
 
-        static::assertSimilarDates($expectedModificationDate, $model->getModificationDate());
+        self::assertSimilarDates($expectedModificationDate, $model->getModificationDate());
     }
 
-    /**
-     * @test
-     */
-    public function savePersistsAndFlushesModel()
+    public function testSavePersistsAndFlushesModel()
     {
-        $this->touchDatabaseTable(static::TABLE_NAME);
-
         $model = new Subscriber();
         $model->setEmail('michiel@example.com');
-        $this->subject->save($model);
+        $this->subscriberRepository->save($model);
 
-        static::assertSame($model, $this->subject->find($model->getId()));
+        self::assertSame($model, $this->subscriberRepository->find($model->getId()));
     }
 
-    /**
-     * @test
-     */
-    public function emailMustBeUnique()
+    public function testEmailMustBeUnique()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class]);
 
         /** @var Subscriber $model */
-        $model = $this->subject->find(1);
+        $model = $this->subscriberRepository->find(1);
 
         $otherModel = new Subscriber();
         $otherModel->generateUniqueId();
@@ -160,22 +119,17 @@ public function emailMustBeUnique()
 
         $this->expectException(UniqueConstraintViolationException::class);
 
-        $this->subject->save($otherModel);
+        $this->subscriberRepository->save($otherModel);
     }
 
-    /**
-     * @test
-     */
-    public function uniqueIdOfNewModelIsGeneratedOnPersist()
+    public function testUniqueIdOfNewModelIsGeneratedOnPersist()
     {
-        $this->touchDatabaseTable(static::TABLE_NAME);
-
         $model = new Subscriber();
         $model->setEmail('oliver@example.com');
 
         $this->entityManager->persist($model);
 
-        static::assertRegExp('/^[0-9a-f]{32}$/', $model->getUniqueId());
+        self::assertMatchesRegularExpression('/^[0-9a-f]{32}$/', $model->getUniqueId());
     }
 
     /**
@@ -183,137 +137,109 @@ public function uniqueIdOfNewModelIsGeneratedOnPersist()
      */
     public function persistingExistingModelKeepsUniqueIdUnchanged()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class]);
 
         /** @var Subscriber $model */
-        $model = $this->subject->find(1);
+        $model = $this->subscriberRepository->find(1);
         $oldUniqueId = $model->getUniqueId();
 
         $model->setEmail('other@example.com');
         $this->entityManager->persist($model);
 
-        static::assertSame($oldUniqueId, $model->getUniqueId());
+        self::assertSame($oldUniqueId, $model->getUniqueId());
     }
 
-    /**
-     * @test
-     */
-    public function findOneByEmailFindsSubscriberWithMatchingEmail()
+    public function testFindOneByEmailFindsSubscriberWithMatchingEmail()
     {
         $email = 'oliver@example.com';
 
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class]);
 
         /** @var Subscriber $model */
-        $model = $this->subject->findOneByEmail($email);
+        $model = $this->subscriberRepository->findOneByEmail($email);
 
-        static::assertInstanceOf(Subscriber::class, $model);
-        static::assertSame($email, $model->getEmail());
+        self::assertInstanceOf(Subscriber::class, $model);
+        self::assertSame($email, $model->getEmail());
     }
 
-    /**
-     * @test
-     */
-    public function findOneByEmailIgnoresSubscriberWithNonMatchingEmail()
+    public function testFindOneByEmailIgnoresSubscriberWithNonMatchingEmail()
     {
         $email = 'other@example.com';
 
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class]);
 
-        $model = $this->subject->findOneByEmail($email);
+        $model = $this->subscriberRepository->findOneByEmail($email);
 
-        static::assertNull($model);
+        self::assertNull($model);
     }
 
-    /**
-     * @test
-     */
-    public function findsAssociatedSubscriptions()
+    public function testFindsAssociatedSubscriptions()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class, SubscriptionFixture::class]);
 
         $id = 1;
         /** @var Subscriber $model */
-        $model = $this->subject->find($id);
+        $model = $this->subscriberRepository->find($id);
         $subscriptions = $model->getSubscriptions();
 
-        static::assertFalse($subscriptions->isEmpty());
+        self::assertFalse($subscriptions->isEmpty());
         /** @var Subscription $firstSubscription */
         $firstSubscription = $subscriptions->first();
-        static::assertInstanceOf(Subscription::class, $firstSubscription);
+        self::assertInstanceOf(Subscription::class, $firstSubscription);
         $expectedSubscriberListId = 2;
-        static::assertSame($expectedSubscriberListId, $firstSubscription->getSubscriberList()->getId());
+        self::assertSame($expectedSubscriberListId, $firstSubscription->getSubscriberList()->getId());
     }
 
-    /**
-     * @test
-     */
-    public function findsAssociatedSubscribedLists()
+    public function testFindsAssociatedSubscribedLists()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class, SubscriptionFixture::class]);
 
         $id = 1;
         /** @var Subscriber $model */
-        $model = $this->subject->find($id);
+        $model = $this->subscriberRepository->find($id);
         $subscribedLists = $model->getSubscribedLists();
 
         $expectedList = $this->subscriberListRepository->find(2);
         $unexpectedList = $this->subscriberListRepository->find(1);
-        static::assertTrue($subscribedLists->contains($expectedList));
-        static::assertFalse($subscribedLists->contains($unexpectedList));
+        self::assertTrue($subscribedLists->contains($expectedList));
+        self::assertFalse($subscribedLists->contains($unexpectedList));
     }
 
-    /**
-     * @test
-     */
-    public function removeAlsoRemovesAssociatedSubscriptions()
+    public function testRemoveAlsoRemovesAssociatedSubscriptions()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class, SubscriptionFixture::class]);
 
         $initialNumberOfSubscriptions = count($this->subscriptionRepository->findAll());
 
         $id = 2;
         /** @var Subscriber $model */
-        $model = $this->subject->find($id);
+        $model = $this->subscriberRepository->find($id);
 
         $numberOfAssociatedSubscriptions = count($model->getSubscriptions());
-        static::assertGreaterThan(0, $numberOfAssociatedSubscriptions);
+        self::assertGreaterThan(0, $numberOfAssociatedSubscriptions);
 
-        $this->subject->remove($model);
+        $this->subscriberRepository->remove($model);
 
         $newNumberOfSubscriptions = count($this->subscriptionRepository->findAll());
         $numberOfRemovedSubscriptions = $initialNumberOfSubscriptions - $newNumberOfSubscriptions;
-        static::assertSame($numberOfAssociatedSubscriptions, $numberOfRemovedSubscriptions);
+        self::assertSame($numberOfAssociatedSubscriptions, $numberOfRemovedSubscriptions);
     }
 
     /**
      * @test
      */
-    public function removeRemovesModel()
+    public function testRemoveRemovesModel()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class]);
 
         /** @var Subscriber[] $allModels */
-        $allModels = $this->subject->findAll();
+        $allModels = $this->subscriberRepository->findAll();
         $numberOfModelsBeforeRemove = count($allModels);
         $firstModel = $allModels[0];
 
-        $this->subject->remove($firstModel);
+        $this->subscriberRepository->remove($firstModel);
 
-        $numberOfModelsAfterRemove = count($this->subject->findAll());
-        static::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);
+        $numberOfModelsAfterRemove = count($this->subscriberRepository->findAll());
+        self::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);
     }
 }
diff --git a/tests/Integration/Domain/Repository/Subscription/SubscriptionRepositoryTest.php b/tests/Integration/Domain/Repository/Subscription/SubscriptionRepositoryTest.php
index 43aa03fa..6e430080 100644
--- a/tests/Integration/Domain/Repository/Subscription/SubscriptionRepositoryTest.php
+++ b/tests/Integration/Domain/Repository/Subscription/SubscriptionRepositoryTest.php
@@ -1,143 +1,105 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\Core\Tests\Integration\Domain\Repository\Subscription;
 
-use Doctrine\ORM\Proxy\Proxy;
+use DateTime;
+//use Doctrine\ORM\Proxy\Proxy;
+use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Domain\Model\Messaging\SubscriberList;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Model\Subscription\Subscription;
 use PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriptionRepository;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberFixture;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberListFixture;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriptionFixture;
 use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
 use PhpList\Core\Tests\TestingSupport\Traits\SimilarDatesAssertionTrait;
-use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * Testcase.
  *
  * @author Oliver Klee <oliver@phplist.com>
  */
-class SubscriptionRepositoryTest extends TestCase
+class SubscriptionRepositoryTest extends KernelTestCase
 {
     use DatabaseTestTrait;
     use SimilarDatesAssertionTrait;
 
-    /**
-     * @var string
-     */
-    const TABLE_NAME = 'phplist_listuser';
-
-    /**
-     * @var string
-     */
-    const ADMINISTRATOR_TABLE_NAME = 'phplist_admin';
-
-    /**
-     * @var string
-     */
-    const SUBSCRIBER_TABLE_NAME = 'phplist_user_user';
-
-    /**
-     * @var string
-     */
-    const SUBSCRIBER_LIST_TABLE_NAME = 'phplist_list';
-
-    /**
-     * @var SubscriptionRepository
-     */
-    private $subject = null;
-
-    /**
-     * @var SubscriberRepository
-     */
-    private $subscriberRepository = null;
-
-    /**
-     * @var SubscriberListRepository
-     */
-    private $subscriberListRepository = null;
-
-    protected function setUp()
+    private ?SubscriptionRepository $subscriptionRepository = null;
+    private ?SubscriberRepository $subscriberRepository = null;
+    private ?SubscriberListRepository $subscriberListRepository = null;
+
+    protected function setUp(): void
     {
-        $this->setUpDatabaseTest();
+        parent::setUp();
+        $this->loadSchema();
 
-        $this->subject = $this->container->get(SubscriptionRepository::class);
+        $this->subscriptionRepository = self::getContainer()->get(SubscriptionRepository::class);
+        $this->subscriberRepository = self::getContainer()->get(SubscriberRepository::class);
+        $this->subscriberListRepository = self::getContainer()->get(SubscriberListRepository::class);
+    }
 
-        $this->subscriberRepository = $this->container->get(SubscriberRepository::class);
-        $this->subscriberListRepository = $this->container->get(SubscriberListRepository::class);
+    protected function tearDown(): void
+    {
+        $schemaTool = new SchemaTool($this->entityManager);
+        $schemaTool->dropDatabase();
+        parent::tearDown();
     }
 
-    /**
-     * @test
-     */
-    public function findAllReadsModelsFromDatabase()
+    public function testFindAllReadsModelsFromDatabase()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriptionFixture::class]);
 
-        $creationDate = new \DateTime('2016-07-22 15:01:17');
-        $modificationDate = new \DateTime('2016-08-23 19:50:43');
+        $creationDate = new DateTime('2016-07-22 15:01:17');
+        $modificationDate = new DateTime('2016-08-23 19:50:43');
 
         /** @var Subscription[] $result */
-        $result = $this->subject->findAll();
+        $result = $this->subscriptionRepository->findAll();
 
-        static::assertNotEmpty($result);
+        self::assertNotEmpty($result);
 
         $model = $result[0];
-        static::assertInstanceOf(Subscription::class, $model);
-        static::assertEquals($creationDate, $model->getCreationDate());
-        static::assertEquals($modificationDate, $model->getModificationDate());
+        self::assertInstanceOf(Subscription::class, $model);
+        self::assertEquals($creationDate, $model->getCreationDate());
+        self::assertEquals($modificationDate, $model->getModificationDate());
     }
 
-    /**
-     * @test
-     */
-    public function createsSubscriberAssociationAsProxy()
+    public function testCreatesSubscriberAssociationAsProxy()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriptionFixture::class]);
 
         $subscriberId = 1;
         /** @var Subscription $model */
-        $model = $this->subject->findAll()[0];
+        $model = $this->subscriptionRepository->findAll()[0];
         $subscriber = $model->getSubscriber();
 
-        static::assertInstanceOf(Subscriber::class, $subscriber);
-        static::assertInstanceOf(Proxy::class, $subscriber);
-        static::assertSame($subscriberId, $subscriber->getId());
+        self::assertInstanceOf(Subscriber::class, $subscriber);
+//        self::assertInstanceOf(Proxy::class, $subscriber); // todo: check proxy
+        self::assertSame($subscriberId, $subscriber->getId());
     }
 
-    /**
-     * @test
-     */
-    public function createsSubscriberListAssociationAsProxy()
+    public function testCreatesSubscriberListAssociationAsProxy()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriptionFixture::class]);
 
         $subscriberListId = 2;
         /** @var Subscription $model */
-        $model = $this->subject->findAll()[0];
+        $model = $this->subscriberRepository->findAll()[0];
         $subscriberList = $model->getSubscriberList();
 
-        static::assertInstanceOf(SubscriberList::class, $subscriberList);
-        static::assertInstanceOf(Proxy::class, $subscriberList);
-        static::assertSame($subscriberListId, $subscriberList->getId());
+        self::assertInstanceOf(SubscriberList::class, $subscriberList);
+        self::assertInstanceOf(Proxy::class, $subscriberList);
+        self::assertSame($subscriberListId, $subscriberList->getId());
     }
 
-    /**
-     * @test
-     */
-    public function creationDateOfNewModelIsSetToNowOnPersist()
+    public function testCreationDateOfNewModelIsSetToNowOnPersist()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->touchDatabaseTable(static::TABLE_NAME);
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class]);
 
         $model = new Subscription();
         /** @var Subscriber $subscriber */
@@ -146,22 +108,16 @@ public function creationDateOfNewModelIsSetToNowOnPersist()
         /** @var SubscriberList $subscriberList */
         $subscriberList = $this->subscriberListRepository->find(1);
         $model->setSubscriberList($subscriberList);
-        $expectedCreationDate = new \DateTime();
+        $expectedCreationDate = new DateTime();
 
         $this->entityManager->persist($model);
 
-        static::assertSimilarDates($expectedCreationDate, $model->getCreationDate());
+        self::assertSimilarDates($expectedCreationDate, $model->getCreationDate());
     }
 
-    /**
-     * @test
-     */
-    public function modificationDateOfNewModelIsSetToNowOnPersist()
+    public function testModificationDateOfNewModelIsSetToNowOnPersist()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->touchDatabaseTable(static::TABLE_NAME);
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberLIstFixture::class]);
 
         $model = new Subscription();
         /** @var Subscriber $subscriber */
@@ -170,63 +126,48 @@ public function modificationDateOfNewModelIsSetToNowOnPersist()
         /** @var SubscriberList $subscriberList */
         $subscriberList = $this->subscriberListRepository->find(1);
         $model->setSubscriberList($subscriberList);
-        $expectedModificationDate = new \DateTime();
+        $expectedModificationDate = new DateTime();
 
         $this->entityManager->persist($model);
 
-        static::assertSimilarDates($expectedModificationDate, $model->getModificationDate());
+        self::assertSimilarDates($expectedModificationDate, $model->getModificationDate());
     }
 
-    /**
-     * @test
-     */
-    public function findBySubscriberFindsSubscriptionOnlyWithTheGivenSubscriber()
+    public function testFindBySubscriberFindsSubscriptionOnlyWithTheGivenSubscriber()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriptionFixture::class]);
 
         /** @var Subscriber $subscriber */
         $subscriber = $this->subscriberRepository->find(1);
 
-        $result = $this->subject->findBySubscriber($subscriber);
+        $result = $this->subscriptionRepository->findBySubscriber($subscriber);
 
         /** @var Subscription $subscription */
         foreach ($result as $subscription) {
-            static::assertSame($subscriber, $subscription->getSubscriber());
+            self::assertSame($subscriber, $subscription->getSubscriber());
         }
     }
 
-    /**
-     * @test
-     */
-    public function findBySubscriberListFindsSubscriptionOnlyWithTheGivenSubscriberList()
+    public function testFindBySubscriberListFindsSubscriptionOnlyWithTheGivenSubscriberList()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriptionFixture::class]);
 
         /** @var SubscriberList $subscriberList */
         $subscriberList = $this->subscriberListRepository->find(1);
 
-        $result = $this->subject->findBySubscriberList($subscriberList);
+        $result = $this->subscriptionRepository->findBySubscriberList($subscriberList);
 
         /** @var Subscription $subscription */
         foreach ($result as $subscription) {
-            static::assertSame($subscriberList, $subscription->getSubscriberList());
+            self::assertSame($subscriberList, $subscription->getSubscriberList());
         }
     }
 
-    /**
-     * @test
-     */
-    public function savePersistsAndFlushesModel()
+    public function testSavePersistsAndFlushesModel()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->touchDatabaseTable(static::TABLE_NAME);
-        $this->applyDatabaseChanges();
-        $numberOfSaveModelsBefore = count($this->subject->findAll());
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class]);
+
+        $numberOfSaveModelsBefore = count($this->subscriptionRepository->findAll());
 
         $model = new Subscription();
         /** @var Subscriber $subscriber */
@@ -235,97 +176,69 @@ public function savePersistsAndFlushesModel()
         /** @var SubscriberList $subscriber */
         $subscriberList = $this->subscriberListRepository->find(1);
         $model->setSubscriberList($subscriberList);
-        $this->subject->save($model);
+        $this->subscriptionRepository->save($model);
 
-        static::assertCount($numberOfSaveModelsBefore + 1, $this->subject->findAll());
+        self::assertCount($numberOfSaveModelsBefore + 1, $this->subscriptionRepository->findAll());
     }
 
-    /**
-     * @test
-     */
-    public function removeRemovesModel()
+    public function testRemoveRemovesModel()
     {
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriptionFixture::class]);
 
         /** @var Subscription[] $allModels */
-        $allModels = $this->subject->findAll();
+        $allModels = $this->subscriptionRepository->findAll();
         $numberOfModelsBeforeRemove = count($allModels);
         $firstModel = $allModels[0];
 
-        $this->subject->remove($firstModel);
+        $this->subscriptionRepository->remove($firstModel);
 
-        $numberOfModelsAfterRemove = count($this->subject->findAll());
-        static::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);
+        $numberOfModelsAfterRemove = count($this->subscriptionRepository->findAll());
+        self::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);
     }
 
-    /**
-     * @test
-     */
-    public function findOneBySubscriberListAndSubscriberForNeitherMatchingReturnsNull()
+    public function testFindOneBySubscriberListAndSubscriberForNeitherMatchingReturnsNull()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class, SubscriptionFixture::class]);
 
         $subscriberList = $this->subscriberListRepository->find(3);
         $subscriber = $this->subscriberRepository->find(4);
-        $result = $this->subject->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
+        $result = $this->subscriptionRepository->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
 
-        static::assertNull($result);
+        self::assertNull($result);
     }
 
-    /**
-     * @test
-     */
-    public function findOneBySubscriberListAndSubscriberForMatchingSubscriberListOnlyReturnsNull()
+    public function testFindOneBySubscriberListAndSubscriberForMatchingSubscriberListOnlyReturnsNull()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class, SubscriptionFixture::class]);
 
         $subscriberList = $this->subscriberListRepository->find(2);
         $subscriber = $this->subscriberRepository->find(4);
-        $result = $this->subject->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
+        $result = $this->subscriptionRepository->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
 
-        static::assertNull($result);
+        self::assertNull($result);
     }
 
-    /**
-     * @test
-     */
-    public function findOneBySubscriberListAndSubscriberForMatchingSubscriberOnlyReturnsNull()
+    public function testFindOneBySubscriberListAndSubscriberForMatchingSubscriberOnlyReturnsNull()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class, SubscriptionFixture::class]);
 
         $subscriberList = $this->subscriberListRepository->find(3);
         $subscriber = $this->subscriberRepository->find(1);
-        $result = $this->subject->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
+        $result = $this->subscriptionRepository->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
 
-        static::assertNull($result);
+        self::assertNull($result);
     }
 
-    /**
-     * @test
-     */
-    public function findOneBySubscriberListAndSubscriberForBothMatchingReturnsMatch()
+    public function testFindOneBySubscriberListAndSubscriberForBothMatchingReturnsMatch()
     {
-        $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/../Fixtures/Subscriber.csv');
-        $this->getDataSet()->addTable(static::SUBSCRIBER_LIST_TABLE_NAME, __DIR__ . '/../Fixtures/SubscriberList.csv');
-        $this->getDataSet()->addTable(static::TABLE_NAME, __DIR__ . '/../Fixtures/Subscription.csv');
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([SubscriberFixture::class, SubscriberListFixture::class, SubscriptionFixture::class]);
 
         $subscriberList = $this->subscriberListRepository->find(2);
         $subscriber = $this->subscriberRepository->find(1);
-        $result = $this->subject->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
+        $result = $this->subscriptionRepository->findOneBySubscriberListAndSubscriber($subscriberList, $subscriber);
 
-        static::assertInstanceOf(Subscription::class, $result);
-        static::assertSame($subscriberList, $result->getSubscriberList());
-        static::assertSame($subscriber, $result->getSubscriber());
+        self::assertInstanceOf(Subscription::class, $result);
+        self::assertSame($subscriberList, $result->getSubscriberList());
+        self::assertSame($subscriber, $result->getSubscriber());
     }
 }
diff --git a/tests/Integration/EmptyStartPageBundle/Controller/DefaultControllerTest.php b/tests/Integration/EmptyStartPageBundle/Controller/DefaultControllerTest.php
index 0ca8cb4f..06f5281b 100644
--- a/tests/Integration/EmptyStartPageBundle/Controller/DefaultControllerTest.php
+++ b/tests/Integration/EmptyStartPageBundle/Controller/DefaultControllerTest.php
@@ -5,34 +5,39 @@
 namespace PhpList\Core\Tests\Integration\EmptyStartPageBundle\Controller;
 
 use PhpList\Core\EmptyStartPageBundle\Controller\DefaultController;
-use PhpList\Core\Tests\TestingSupport\AbstractWebTest;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * Testcase.
  *
  * @author Oliver Klee <oliver@phplist.com>
  */
-class DefaultControllerTest extends AbstractWebTest
+class DefaultControllerTest extends WebTestCase
 {
-    public function testControllerIsAvailableViaContainer()
+    public function testControllerIsAvailableViaContainer(): void
     {
+        $client = self::createClient();
+        $container = $client->getContainer();
+
         self::assertInstanceOf(
             DefaultController::class,
-            $this->client->getContainer()->get(DefaultController::class)
+            $container->get(DefaultController::class)
         );
     }
 
-    /**
-     * @test
-     */
-    public function indexActionReturnsResponseWithHelloWorld()
+    public function testIndexActionReturnsResponseWithHelloWorld(): void
     {
-        $this->client->request('GET', '/');
+        $client = self::createClient();
+        $client->request('GET', '/api/v2');
+
+        $response = $client->getResponse();
+
+        dump($response->getContent());
 
-        self::assertTrue($this->client->getResponse()->isSuccessful());
-        self::assertContains(
+        self::assertTrue($response->isSuccessful());
+        self::assertStringContainsString(
             'This page has been intentionally left empty.',
-            $this->client->getResponse()->getContent()
+            $response->getContent()
         );
     }
 }
diff --git a/tests/Integration/Routing/ExtraLoaderTest.php b/tests/Integration/Routing/ExtraLoaderTest.php
index 1f1ec03e..73534aed 100644
--- a/tests/Integration/Routing/ExtraLoaderTest.php
+++ b/tests/Integration/Routing/ExtraLoaderTest.php
@@ -10,10 +10,10 @@
 use PhpList\Core\Core\Environment;
 use PhpList\Core\Routing\ExtraLoader;
 use PHPUnit\Framework\TestCase;
-use Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader;
+use Symfony\Bundle\FrameworkBundle\Routing\AttributeRouteControllerLoader;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
-use Symfony\Component\HttpKernel\Config\FileLocator;
-use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
+use Symfony\Component\Routing\Loader\AttributeDirectoryLoader;
 use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -34,16 +34,20 @@ protected function setUp(): void
 
         $this->kernel = $bootstrap->getApplicationKernel();
         $this->kernel->boot();
-        $container = $this->kernel->getContainer();
 
-        /** @var FileLocator $locator */
-        $locator = $container->get('file_locator');
-//        $attributeLoader = new AttributeRouteControllerLoader(new SimpleAnnotationReader());
+        $locator = new FileLocator([
+            $this->kernel->getProjectDir() . '/config',
+            $this->kernel->getProjectDir() . '/composer.json',
+            $this->kernel->getProjectDir() . '/src/EmptyStartPageBundle/Controller/'
+        ]);
+
+        $attributeLoader = new AttributeRouteControllerLoader();
+        $attributeDirectoryLoader = new AttributeDirectoryLoader($locator, $attributeLoader);
 
         $loaderResolver = new LoaderResolver(
             [
                 new YamlFileLoader($locator),
-//                new AttributeDirectoryLoader($locator, $attributeLoader),
+                $attributeDirectoryLoader,
             ]
         );
 
@@ -57,7 +61,7 @@ protected function tearDown(): void
         Bootstrap::purgeInstance();
     }
 
-    public function testLoadReturnsRouteCollection()
+    public function testLoadReturnsRouteCollection(): void
     {
         self::assertInstanceOf(RouteCollection::class, $this->subject->load('', 'extra'));
     }
diff --git a/tests/Integration/Security/AuthenticationTest.php b/tests/Integration/Security/AuthenticationTest.php
index 2122faca..2c831a09 100644
--- a/tests/Integration/Security/AuthenticationTest.php
+++ b/tests/Integration/Security/AuthenticationTest.php
@@ -4,8 +4,11 @@
 
 namespace PhpList\Core\Tests\Integration\Security;
 
+use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Security\Authentication;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\AdministratorFixture;
+use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\AdministratorTokenWithAdministratorFixture;
 use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
@@ -26,39 +29,29 @@ protected function setUp(): void
         parent::setUp();
         $this->loadSchema();
 
-        $this->subject = $this->container->get(Authentication::class);
+        $this->subject = self::getContainer()->get(Authentication::class);
     }
 
-    /**
-     * @test
-     */
-    public function subjectIsAvailableViaContainer()
+    protected function tearDown(): void
     {
-        static::assertInstanceOf(Authentication::class, $this->subject);
+        $schemaTool = new SchemaTool($this->entityManager);
+        $schemaTool->dropDatabase();
+        parent::tearDown();
     }
 
-    /**
-     * @test
-     */
-    public function classIsRegisteredAsSingletonInContainer()
+    public function testSubjectIsAvailableViaContainer()
     {
-        static::assertSame($this->subject, $this->container->get(Authentication::class));
+        self::assertInstanceOf(Authentication::class, $this->subject);
     }
 
-    /**
-     * @test
-     */
-    public function authenticateByApiKeyWithValidApiKeyReturnsMatchingAdministrator()
+    public function testClassIsRegisteredAsSingletonInContainer()
     {
-        $this->getDataSet()->addTable(
-            static::ADMINISTRATOR_TABLE_NAME,
-            __DIR__ . '/../Domain/Repository/Fixtures/Administrator.csv'
-        );
-        $this->getDataSet()->addTable(
-            static::TOKEN_TABLE_NAME,
-            __DIR__ . '/../Domain/Repository/Fixtures/AdministratorTokenWithAdministrator.csv'
-        );
-        $this->applyDatabaseChanges();
+        self::assertSame($this->subject, self::getContainer()->get(Authentication::class));
+    }
+
+    public function testAuthenticateByApiKeyWithValidApiKeyReturnsMatchingAdministrator()
+    {
+        $this->loadFixtures([AdministratorFixture::class, AdministratorTokenWithAdministratorFixture::class]);
 
         $apiKey = 'cfdf64eecbbf336628b0f3071adba762';
         $request = new Request();
@@ -66,24 +59,13 @@ public function authenticateByApiKeyWithValidApiKeyReturnsMatchingAdministrator(
 
         $result = $this->subject->authenticateByApiKey($request);
 
-        static::assertInstanceOf(Administrator::class, $result);
-        static::assertSame(1, $result->getId());
+        self::assertInstanceOf(Administrator::class, $result);
+        self::assertSame(1, $result->getId());
     }
 
-    /**
-     * @test
-     */
-    public function authenticateByApiKeyWithValidApiKeyAndDisabledAdministratorReturnsNull()
+    public function testAuthenticateByApiKeyWithValidApiKeyAndDisabledAdministratorReturnsNull()
     {
-        $this->getDataSet()->addTable(
-            static::ADMINISTRATOR_TABLE_NAME,
-            __DIR__ . '/../Domain/Repository/Fixtures/Administrator.csv'
-        );
-        $this->getDataSet()->addTable(
-            static::TOKEN_TABLE_NAME,
-            __DIR__ . '/../Domain/Repository/Fixtures/AdministratorTokenWithAdministrator.csv'
-        );
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([AdministratorFixture::class, AdministratorTokenWithAdministratorFixture::class]);
 
         $apiKey = 'cfdf64eecbbf336628b0f3071adba765';
         $request = new Request();
@@ -91,19 +73,12 @@ public function authenticateByApiKeyWithValidApiKeyAndDisabledAdministratorRetur
 
         $result = $this->subject->authenticateByApiKey($request);
 
-        static::assertNull($result);
+        self::assertNull($result);
     }
 
-    /**
-     * @test
-     */
-    public function authenticateByApiKeyWithValidApiKeyForInexistentAdministratorReturnsNull()
+    public function testAuthenticateByApiKeyWithValidApiKeyForInexistentAdministratorReturnsNull()
     {
-        $this->getDataSet()->addTable(
-            static::TOKEN_TABLE_NAME,
-            __DIR__ . '/../Domain/Repository/Fixtures/AdministratorTokenWithAdministrator.csv'
-        );
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([AdministratorTokenWithAdministratorFixture::class]);
 
         $apiKey = 'cfdf64eecbbf336628b0f3071adba763';
         $request = new Request();
@@ -114,16 +89,9 @@ public function authenticateByApiKeyWithValidApiKeyForInexistentAdministratorRet
         static::assertNull($result);
     }
 
-    /**
-     * @test
-     */
-    public function authenticateByApiKeyWithValidApiKeyForNonSuperUserAdministratorReturnsNull()
+    public function testAuthenticateByApiKeyWithValidApiKeyForNonSuperUserAdministratorReturnsNull()
     {
-        $this->getDataSet()->addTable(
-            static::TOKEN_TABLE_NAME,
-            __DIR__ . '/../Domain/Repository/Fixtures/AdministratorTokenWithAdministrator.csv'
-        );
-        $this->applyDatabaseChanges();
+        $this->loadFixtures([AdministratorTokenWithAdministratorFixture::class]);
 
         $apiKey = 'cfdf64eecbbf336628b0f3071adba764';
         $request = new Request();
@@ -131,6 +99,6 @@ public function authenticateByApiKeyWithValidApiKeyForNonSuperUserAdministratorR
 
         $result = $this->subject->authenticateByApiKey($request);
 
-        static::assertNull($result);
+        self::assertNull($result);
     }
 }
diff --git a/tests/Integration/Security/HashGeneratorTest.php b/tests/Integration/Security/HashGeneratorTest.php
index 571682a6..d53357b5 100644
--- a/tests/Integration/Security/HashGeneratorTest.php
+++ b/tests/Integration/Security/HashGeneratorTest.php
@@ -1,64 +1,45 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\Core\Tests\Integration\Security;
 
-use PhpList\Core\Core\ApplicationKernel;
-use PhpList\Core\Core\Bootstrap;
-use PhpList\Core\Core\Environment;
+use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Security\HashGenerator;
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * Testcase.
  *
  * @author Oliver Klee <oliver@phplist.com>
  */
-class HashGeneratorTest extends TestCase
+class HashGeneratorTest extends KernelTestCase
 {
-    /**
-     * @var ApplicationKernel
-     */
-    private $kernel = null;
-
-    /**
-     * @var ContainerInterface
-     */
-    private $container = null;
+    use DatabaseTestTrait;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $bootstrap = Bootstrap::getInstance();
-        $bootstrap->setEnvironment(Environment::TESTING)->configure();
-
-        $this->kernel = $bootstrap->getApplicationKernel();
-        $this->kernel->boot();
-
-        $this->container = $this->kernel->getContainer();
+        parent::setUp();
+        $this->loadSchema();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
-        $this->kernel->shutdown();
-        Bootstrap::purgeInstance();
+        $schemaTool = new SchemaTool($this->entityManager);
+        $schemaTool->dropDatabase();
+        parent::tearDown();
     }
 
-    /**
-     * @test
-     */
-    public function subjectIsAvailableViaContainer()
+    public function testSubjectIsAvailableViaContainer()
     {
-        static::assertInstanceOf(HashGenerator::class, $this->container->get(HashGenerator::class));
+        self::assertInstanceOf(HashGenerator::class, self::getContainer()->get(HashGenerator::class));
     }
 
-    /**
-     * @test
-     */
-    public function classIsRegisteredAsSingletonInContainer()
+    public function testClassIsRegisteredAsSingletonInContainer()
     {
         $id = HashGenerator::class;
 
-        static::assertSame($this->container->get($id), $this->container->get($id));
+        self::assertSame(self::getContainer()->get($id), self::getContainer()->get($id));
     }
 }
diff --git a/tests/Support/Interfaces/TestMarker.php b/tests/Support/Interfaces/TestMarker.php
index 48643fb8..caca8eac 100644
--- a/tests/Support/Interfaces/TestMarker.php
+++ b/tests/Support/Interfaces/TestMarker.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\Core\Tests\Support\Interfaces;
diff --git a/tests/System/ApplicationBundle/PhpListApplicationBundleTest.php b/tests/System/ApplicationBundle/PhpListApplicationBundleTest.php
index 688bc205..955e034c 100644
--- a/tests/System/ApplicationBundle/PhpListApplicationBundleTest.php
+++ b/tests/System/ApplicationBundle/PhpListApplicationBundleTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\Core\Tests\System\ApplicationBundle;
@@ -16,19 +17,19 @@ class PhpListApplicationBundleTest extends TestCase
 {
     use SymfonyServerTrait;
 
-    /**
-     * @var Client
-     */
-    private $httpClient = null;
+    private ?Client $httpClient = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->httpClient = new Client(['http_errors' => false]);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->stopSymfonyServer();
+        $this->httpClient = null;
+        parent::tearDown();
     }
 
     /**
@@ -43,30 +44,31 @@ public function environmentDataProvider(): array
     }
 
     /**
-     * @test
      * @param string $environment
      * @dataProvider environmentDataProvider
      */
-    public function homepageReturnsSuccess(string $environment)
+    public function testHomepageReturnsSuccess(string $environment): void
     {
         $this->startSymfonyServer($environment);
 
         $response = $this->httpClient->get('/', ['base_uri' => $this->getBaseUrl()]);
 
-        static::assertSame(200, $response->getStatusCode());
+        self::assertSame(200, $response->getStatusCode());
     }
 
     /**
-     * @test
      * @param string $environment
      * @dataProvider environmentDataProvider
      */
-    public function homepageReturnsDummyContent(string $environment)
+    public function testHomepageReturnsDummyContent(string $environment): void
     {
         $this->startSymfonyServer($environment);
 
         $response = $this->httpClient->get('/', ['base_uri' => $this->getBaseUrl()]);
 
-        static::assertContains('This page has been intentionally left empty.', $response->getBody()->getContents());
+        self::assertStringContainsString(
+            'This page has been intentionally left empty.',
+            $response->getBody()->getContents()
+        );
     }
 }