diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
index 5603b1b78..5147936c9 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
@@ -50,18 +50,15 @@ class DateAggregator implements AggregatorInterface
         switch ($data['frequency']) {
             case 'month':
                 $fmt = 'MM';
-
-break;
+                break;
 
             case 'week':
                 $fmt = 'IW';
-
-break;
+                break;
 
             case 'year':
                 $fmt = 'YYYY'; $order = 'DESC';
-
-break; // order DESC does not works !
+                break; // order DESC does not works !
 
             default:
                 throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
index 9d7cd3116..f82793e71 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -55,10 +55,10 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
     {
         // add select element
         if ('reasons' === $data['level']) {
-            $elem = 'reasons.id';
+            $elem = 'actreasons.id';
             $alias = 'activity_reasons_id';
         } elseif ('categories' === $data['level']) {
-            $elem = 'category.id';
+            $elem = 'actreasoncat.id';
             $alias = 'activity_categories_id';
         } else {
             throw new RuntimeException('The data provided are not recognized.');
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
new file mode 100644
index 000000000..b4da861e8
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class BySocialActionAggregatorTest extends AbstractAggregatorTest
+{
+    private BySocialActionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.bysocialaction_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.socialActions', 'actsocialaction')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
new file mode 100644
index 000000000..ab447739e
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
+{
+    private BySocialIssueAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.bysocialissue_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.socialIssues', 'actsocialissue')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
new file mode 100644
index 000000000..e65ffec62
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
+{
+    private ByThirdpartyAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.bythirdparty_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.thirdParties', 'acttparty')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
new file mode 100644
index 000000000..da1f0ecac
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ByUserAggregatorTest extends AbstractAggregatorTest
+{
+    private ByUserAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.byuser_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.users', 'actusers')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
new file mode 100644
index 000000000..f8775b8bf
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class DateAggregatorTest extends AbstractAggregatorTest
+{
+    private DateAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.date_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'frequency' => 'month',
+            ],
+            [
+                'frequency' => 'week',
+            ],
+            [
+                'frequency' => 'year',
+            ]
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
new file mode 100644
index 000000000..8f8b866bc
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class LocationTypeAggregatorTest extends AbstractAggregatorTest
+{
+    private LocationTypeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.locationtype_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.location', 'actloc')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
new file mode 100644
index 000000000..3434f1a1c
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class UserScopeAggregatorTest extends AbstractAggregatorTest
+{
+    private UserScopeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.userscope_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.user', 'actuser')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
new file mode 100644
index 000000000..6de364ae7
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
+{
+    private ActivityReasonAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.reason_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'level' => 'reasons',
+            ],
+            [
+                'level' => 'categories',
+            ]
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.person', 'actperson')
+                ->innerJoin('activity.reasons', 'actreasons')
+                ->join('actreasons.category', 'actreasoncat')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
index cf5fe5c31..40792a1c6 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -25,7 +25,6 @@ use function is_string;
 /**
  * Helper which creates a set of test for aggregators.
  *
- * @internal
  */
 abstract class AbstractAggregatorTest extends KernelTestCase
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
index b4f5e0071..bf0f48ab4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
@@ -39,7 +39,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->addSelect('IDENTITY(eval.evaluation) AS evaluationtype_aggregator');
+        $qb->addSelect('IDENTITY(workeval.evaluation) AS evaluationtype_aggregator');
 
         $groupBy = $qb->getDQLPart('groupBy');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
index e799d8dfa..2ed1752b0 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
@@ -59,6 +59,7 @@ final class MaritalStatusAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
+        // no form
     }
 
     public function getLabels($key, array $values, $data)
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
new file mode 100644
index 000000000..82a879b19
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\AdministrativeLocationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
+{
+    private AdministrativeLocationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_administrative_location');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.administrativeLocation', 'acploc')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
new file mode 100644
index 000000000..279b621d4
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingMotiveAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
+{
+    private ClosingMotiveAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_closingmotive');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.closingMotive', 'acpmotive')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
new file mode 100644
index 000000000..ab0e3dae3
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ConfidentialAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ConfidentialAggregatorTest extends AbstractAggregatorTest
+{
+    private ConfidentialAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_confidential');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
new file mode 100644
index 000000000..056c396e0
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\DurationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class DurationAggregatorTest extends AbstractAggregatorTest
+{
+    private DurationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_duration');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
new file mode 100644
index 000000000..0b8ff2b12
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EmergencyAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class EmergencyAggregatorTest extends AbstractAggregatorTest
+{
+    private EmergencyAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_emergency');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
new file mode 100644
index 000000000..8c67eb649
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EvaluationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class EvaluationAggregatorTest extends AbstractAggregatorTest
+{
+    private EvaluationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_evaluation');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
new file mode 100644
index 000000000..b3da8ea13
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\IntensityAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class IntensityAggregatorTest extends AbstractAggregatorTest
+{
+    private IntensityAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_intensity');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
new file mode 100644
index 000000000..8e14ffe4c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\JobAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class JobAggregatorTest extends AbstractAggregatorTest
+{
+    private JobAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer_job');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.job', 'acpjob')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
new file mode 100644
index 000000000..cdd709226
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OriginAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class OriginAggregatorTest extends AbstractAggregatorTest
+{
+    private OriginAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_origin');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.origin', 'acporigin')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
new file mode 100644
index 000000000..789baa228
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ReferrerAggregatorTest extends AbstractAggregatorTest
+{
+    private ReferrerAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.user', 'acpuser')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
new file mode 100644
index 000000000..f888e2535
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\RequestorAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class RequestorAggregatorTest extends AbstractAggregatorTest
+{
+    private RequestorAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_requestor');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
new file mode 100644
index 000000000..05fe5e980
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ScopeAggregatorTest extends AbstractAggregatorTest
+{
+    private ScopeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer_scope');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.scopes', 'acpscope')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
new file mode 100644
index 000000000..cdf27c1a5
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialActionAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class SocialActionAggregatorTest extends AbstractAggregatorTest
+{
+    private SocialActionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_socialaction');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
new file mode 100644
index 000000000..912a2b7c6
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialIssueAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class SocialIssueAggregatorTest extends AbstractAggregatorTest
+{
+    private SocialIssueAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_socialissue');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.socialIssues', 'acpsocialissue')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
new file mode 100644
index 000000000..ee11eeee4
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class StepAggregatorTest extends AbstractAggregatorTest
+{
+    private StepAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_step');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-01-01'),
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
new file mode 100644
index 000000000..60b8d838c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\EvaluationAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\EvaluationAggregators\EvaluationTypeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
+{
+    private EvaluationTypeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_evaluationtype');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
new file mode 100644
index 000000000..bef052329
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
+{
+    private ChildrenNumberAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_household_childrennumber');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ->join('acppart.person', 'partperson')
+                ->join('partperson.householdParticipations', 'member')
+                ->join('member.household', 'household')
+                ->join('household.compositions', 'composition')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
new file mode 100644
index 000000000..fc808c03d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class CompositionAggregatorTest extends AbstractAggregatorTest
+{
+    private CompositionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_household_composition');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ->join('acppart.person', 'partperson')
+                ->join('partperson.householdParticipations', 'member')
+                ->join('member.household', 'household')
+                ->join('household.compositions', 'composition')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
new file mode 100644
index 000000000..90596d892
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Export\Aggregator\PersonAggregators\CountryOfBirthAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
+{
+    private CountryOfBirthAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_country_of_birth');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            ['group_by_level' => 'continent'],
+            ['group_by_level' => 'country',],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(person.id)')
+                ->from(Person::class, 'person')
+                ->leftJoin('person.countryOfBirth', 'countryOfBirth')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
new file mode 100644
index 000000000..91a22d05a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Export\Aggregator\PersonAggregators\HouseholdPositionAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr;
+
+final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
+{
+    private HouseholdPositionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_household_position');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'date_position' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(person.id)')
+                ->from(Person::class, 'person')
+                ->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person')
+                ->join('person.center', 'center')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
new file mode 100644
index 000000000..25ddb602d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Export\Aggregator\PersonAggregators\MaritalStatusAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
+{
+    private MaritalStatusAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_marital_status');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(person.id)')
+                ->from(Person::class, 'person')
+                ->join('person.maritalStatus', 'personmarital')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
index ab0492d11..ed83c3af7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator;
 
 /**
@@ -34,14 +35,14 @@ final class ActionTypeAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public function getQueryBuilders(): array
     {
         if (null === self::$kernel) {
             self::bootKernel();
@@ -53,7 +54,8 @@ final class ActionTypeAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from('ChillPersonBundle:AccompanyingPeriodWork', 'acpw'),
+                ->from(AccompanyingPeriodWork::class, 'acpw')
+                ,
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
index ef5bd5097..979f3c488 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator;
 
 /**
@@ -34,14 +35,14 @@ final class GoalAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public function getQueryBuilders(): array
     {
         if (null === self::$kernel) {
             self::bootKernel();
@@ -53,7 +54,8 @@ final class GoalAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from('ChillPersonBundle:AccompanyingPeriodWork', 'acpw'),
+                ->from(AccompanyingPeriodWork::class, 'acpw')
+                ,
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
new file mode 100644
index 000000000..37642fa33
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalResultAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class GoalResultAggregatorTest extends AbstractAggregatorTest
+{
+    private GoalResultAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_goalresult');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.goals', 'goal')
+                ->join('goal.results', 'goalresult')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
new file mode 100644
index 000000000..c686e66b6
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class JobAggregatorTest extends AbstractAggregatorTest
+{
+    private JobAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_treatingagent_job');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.referrers', 'acpwuser')
+                ,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
index 446cf1e37..b8070398a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator;
 
 /**
@@ -34,14 +35,14 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public function getQueryBuilders(): array
     {
         if (null === self::$kernel) {
             self::bootKernel();
@@ -53,7 +54,8 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from('ChillPersonBundle:AccompanyingPeriodWork', 'acpw'),
+                ->from(AccompanyingPeriodWork::class, 'acpw')
+                ,
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
index a34a16a8a..984e296bc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ResultAggregator;
 
 /**
@@ -34,14 +35,14 @@ final class ResultAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public function getQueryBuilders(): array
     {
         if (null === self::$kernel) {
             self::bootKernel();
@@ -53,7 +54,8 @@ final class ResultAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from('ChillPersonBundle:AccompanyingPeriodWork', 'acpw'),
+                ->from(AccompanyingPeriodWork::class, 'acpw')
+                ,
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
new file mode 100644
index 000000000..3cece9ed9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ScopeAggregatorTest extends AbstractAggregatorTest
+{
+    private ScopeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_treatingagent_scope');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.referrers', 'acpwuser')
+                ,
+        ];
+    }
+}