diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
index 1a91d4629..cf5fe5c31 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -166,6 +166,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
         $this->assertContainsOnly(
             'string',
             $queryKeys,
+            true,
             'test that the query keys returned by `getQueryKeys` are only strings'
         );
         $this->assertGreaterThanOrEqual(
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index d7da05aa7..60d539573 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -16,6 +16,7 @@ use Doctrine\ORM\NativeQuery;
 use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\BrowserKit\HttpBrowser;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Role\Role;
 use Traversable;
@@ -140,6 +141,7 @@ abstract class AbstractExportTest extends WebTestCase
         $this->assertContainsOnly(
             'string',
             $formattersTypes,
+            true,
             'Test that the method `getAllowedFormattersTypes` returns an array of string'
         );
     }
@@ -174,6 +176,7 @@ abstract class AbstractExportTest extends WebTestCase
         $this->assertContainsOnly(
             'string',
             $queryKeys,
+            true,
             'test that the query keys returned by `getQueryKeys` are only strings'
         );
         $this->assertGreaterThanOrEqual(
@@ -330,8 +333,9 @@ abstract class AbstractExportTest extends WebTestCase
      */
     public function testListExportPage()
     {
-        /** @var \Symfony\Component\BrowserKit\Client $client */
-        $client = $this->getClient();
+        /** @var HttpBrowser $client */
+        $client = new HttpBrowser();
+
         $export = $this->getExport();
         $prophet = new \Prophecy\Prophet();
         $container = static::$kernel->getContainer();
@@ -395,6 +399,7 @@ abstract class AbstractExportTest extends WebTestCase
             $this->assertContainsOnly(
                 'string',
                 $export->supportsModifiers(),
+                true,
                 'Test that the `supportsModifiers` method returns only strings'
             );
         } elseif ($query instanceof NativeQuery) {
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
index 4355687e1..34869c30b 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Test\Export;
 
 use Doctrine\ORM\QueryBuilder;
 use Exception;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 use function count;
@@ -27,14 +28,16 @@ use function is_string;
  */
 abstract class AbstractFilterTest extends KernelTestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var \Prophecy\Prophet
      */
-    protected $prophet;
+    private $prophet;
 
     protected function setUp(): void
     {
-        $this->prepareProphet();
+        $$this->prophet = $this->getProphet();
     }
 
     public function dataProviderAlterQuery()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
new file mode 100644
index 000000000..d6fa9a843
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Export\Export;
+
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Export\Export\CountAccompanyingCourse;
+
+final class CountAccompanyingCourseTest extends AbstractExportTest
+{
+    private CountAccompanyingCourse $export;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.person.export.count_accompanyingcourse');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getExport()
+    {
+        return $this->export;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [[]];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getModifiersCombination()
+    {
+        return [[Declarations::ACP_TYPE]];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
index 831de2933..fe7d91753 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
@@ -30,7 +30,7 @@ final class CountPersonTest extends AbstractExportTest
     {
         self::bootKernel();
 
-        $this->export = self::$container->get('chill.person.export.export_count_person');
+        $this->export = self::$container->get('chill.person.export.count_person');
     }
 
     public function getExport()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
new file mode 100644
index 000000000..7c1420c86
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Export\Export;
+
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Export\Export\StatAccompanyingCourseDuration;
+
+final class StatAccompanyingCourseDurationTest extends AbstractExportTest
+{
+    private StatAccompanyingCourseDuration $export;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.person.export.avg_accompanyingcourse_duration');
+    }
+
+    public function getExport()
+    {
+        return $this->export;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            ['closingdate' => \DateTime::createFromFormat('Y-m-d', '2022-06-30')],
+        ];
+    }
+
+    public function getModifiersCombination()
+    {
+        return [[Declarations::ACP_TYPE]];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ClosingMotiveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ClosingMotiveFilterTest.php
new file mode 100644
index 000000000..cbfa1c306
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ClosingMotiveFilterTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+use Chill\PersonBundle\Export\Filter\ClosingMotiveFilter;
+use Doctrine\ORM\EntityManagerInterface;
+
+class ClosingMotiveFilterTest extends AbstractFilterTest
+{
+    private ClosingMotiveFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_closingmotive');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(ClosingMotive::class, 'm')
+            ->select('m')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach($array as $m) {
+            $data[] = ['accepted_closingmotives' => $m];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ConfidentialFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ConfidentialFilterTest.php
new file mode 100644
index 000000000..1d8573916
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ConfidentialFilterTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\ConfidentialFilter;
+use Doctrine\ORM\EntityManagerInterface;
+
+class ConfidentialFilterTest extends AbstractFilterTest
+{
+    private ConfidentialFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_confidential');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            ['accepted_confidentials' => true],
+            ['accepted_confidentials' => false]
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EmergencyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EmergencyFilterTest.php
new file mode 100644
index 000000000..0533a604a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EmergencyFilterTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\EmergencyFilter;
+use Doctrine\ORM\EntityManagerInterface;
+
+class EmergencyFilterTest extends AbstractFilterTest
+{
+    private EmergencyFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_emergency');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            ['accepted_emergencies' => true],
+            ['accepted_emergencies' => false]
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/IntensityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/IntensityFilterTest.php
new file mode 100644
index 000000000..c39602cf8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/IntensityFilterTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\IntensityFilter;
+use Doctrine\ORM\EntityManagerInterface;
+
+class IntensityFilterTest extends AbstractFilterTest
+{
+    private IntensityFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_intensity');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            ['accepted_intensities' => 'occasional'],
+            ['accepted_intensities' => 'regular']
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/OriginFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/OriginFilterTest.php
new file mode 100644
index 000000000..7aa1f1c7a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/OriginFilterTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
+use Chill\PersonBundle\Export\Filter\OriginFilter;
+use Doctrine\ORM\EntityManagerInterface;
+
+class OriginFilterTest extends AbstractFilterTest
+{
+    private OriginFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_origin');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(Origin::class, 'o')
+            ->select('o')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach($array as $l) {
+            $data[] = ['accepted_origins' => $l];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialIssueFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialIssueFilterTest.php
index ed520e90b..ac092884b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialIssueFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialIssueFilterTest.php
@@ -1,63 +1,75 @@
 <?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\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Export\Filter\SocialIssueFilter;
+use Doctrine\ORM\EntityManagerInterface;
 
-final class SocialIssueFilterTest extends AbstractFilterTest
+class SocialIssueFilterTest extends AbstractFilterTest
 {
-    /**
-     * @var \Chill\PersonBundle\Export\Filter\GenderFilter
-     */
-    private $filter;
+    private SocialIssueFilter $filter;
 
     protected function setUp(): void
     {
-        parent::setUp();
-
         self::bootKernel();
 
-        try {
-            $this->filter = self::$container->get('chill.person.export.filter_socialissue');
-        } catch (ServiceNotFoundException $e) {
-            $this->markTestSkipped('Filter service is not found');
-        }
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_socialissue');
     }
 
+    /**
+     * @inheritDoc
+     */
     public function getFilter()
     {
         return $this->filter;
     }
 
-    public function getFormData()
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
     {
-       return [
-           ['accepted_socialissue' => [
+        $em = self::$container->get(EntityManagerInterface::class);
 
-           ]],
-           ['accepted_socialissue' => [
+        $array = $em->createQueryBuilder()
+            ->from(SocialIssue::class, 'si')
+            ->select('si')
+            ->getQuery()
+            ->getResult();
 
-           ]],
-           ['accepted_socialissue' => [
+        $data = [];
 
-           ]],
-       ];
+        foreach($array as $i) {
+            $data[] = ['accepted_socialissues' => $i];
+        }
+
+        return $data;
     }
 
-    public function getQueryBuilders()
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
     {
-        // TODO: Implement getQueryBuilders() method.
-    }
 
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/StepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/StepFilterTest.php
new file mode 100644
index 000000000..1a8dfd2ff
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/StepFilterTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Filter\StepFilter;
+
+class StepFilterTest extends AbstractFilterTest
+{
+    private StepFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_step');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            ['accepted_steps' => AccompanyingPeriod::STEP_DRAFT],
+            ['accepted_steps' => AccompanyingPeriod::STEP_CONFIRMED],
+            ['accepted_steps' => AccompanyingPeriod::STEP_CLOSED],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get('doctrine.orm.entity_manager');
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserJobFilterTest.php
new file mode 100644
index 000000000..452728384
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserJobFilterTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\UserJobFilter;
+use Doctrine\ORM\EntityManagerInterface;
+
+class UserJobFilterTest extends AbstractFilterTest
+{
+    private UserJobFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_userjob');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserScopeFilterTest.php
new file mode 100644
index 000000000..fd22ded6e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserScopeFilterTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\UserScopeFilter;
+use Doctrine\ORM\EntityManagerInterface;
+
+class UserScopeFilterTest extends AbstractFilterTest
+{
+    private UserScopeFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_userscope');
+
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('acp.id')
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+        ];
+    }
+}
\ No newline at end of file