diff --git a/.runtests/Integration tests GENESIS.run.xml b/.runtests/Integration tests GENESIS.run.xml
new file mode 100644
index 00000000..a49e299f
--- /dev/null
+++ b/.runtests/Integration tests GENESIS.run.xml	
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Integration tests GENESIS" type="JUnit" factoryName="JUnit">
+    <module name="genesis-api" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="directory" />
+    <dir value="$PROJECT_DIR$/src/test/java/integration_tests" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.runtests/Unit tests GENESIS.run.xml b/.runtests/Unit tests GENESIS.run.xml
index 9836f071..80658542 100644
--- a/.runtests/Unit tests GENESIS.run.xml	
+++ b/.runtests/Unit tests GENESIS.run.xml	
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Unit tests GENESIS" type="JUnit" factoryName="JUnit">
     <module name="genesis-api" />
+    <extension name="coverage" runner="jacoco" />
     <option name="PACKAGE_NAME" value="fr.insee.genesis" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
diff --git a/pom.xml b/pom.xml
index 9b4a3a7a..7575fbc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,16 +263,46 @@
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>properties</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <printSummary>true</printSummary>
                     <includes>
-                        <include>**/*FT.java</include>
                         <include>**/*Test.java</include>
                         <include>**/*Tests.java</include>
                     </includes>
+                    <parallel>methods</parallel>
+                    <threadCount>4</threadCount>
+                    <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includes>
+                        <include>**/*IT.java</include>
+                    </includes>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java b/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java
index a35397ab..afa7389f 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java
@@ -25,7 +25,7 @@ public class CombinedRawDataController {
     @Operation(summary = "Retrieve combined raw responses and Lunatic raw data for a given interrogationId")
     @GetMapping
     @PreAuthorize("hasAnyRole('ADMIN', 'USER_PLATINE')")
-    public ResponseEntity<CombinedRawDataDto> getCombinetRawData(
+    public ResponseEntity<CombinedRawDataDto> getCombinedRawData(
             @RequestParam(INTERROGATION_ID) String interrogationId
     ){
         CombinedRawDataDto data = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
diff --git a/src/main/java/fr/insee/genesis/controller/rest/DataProcessingContextController.java b/src/main/java/fr/insee/genesis/controller/rest/DataProcessingContextController.java
index 803ecc2b..10cd276b 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/DataProcessingContextController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/DataProcessingContextController.java
@@ -181,7 +181,9 @@ public ResponseEntity<Object> saveScheduleWithCollectionInstrumentId(
                     collectionInstrumentId,
                     serviceToCall == null ? ServiceToCall.MAIN : serviceToCall,
                     frequency,
-                    scheduleBeginDate, scheduleEndDate, trustParameters
+                    scheduleBeginDate,
+                    scheduleEndDate,
+                    trustParameters
             );
         }catch (GenesisException e){
             return new ResponseEntity<>(e.getMessage(), HttpStatusCode.valueOf(e.getStatus()));
diff --git a/src/main/java/fr/insee/genesis/controller/rest/HealthCheckController.java b/src/main/java/fr/insee/genesis/controller/rest/HealthCheckController.java
index 72e1f50a..cd8b1ee1 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/HealthCheckController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/HealthCheckController.java
@@ -45,11 +45,11 @@ public ResponseEntity<String> healthcheckMongo() {
                              MongoDB OK
                             \s
                              %s Responses
-                             %s Schedules
+                             %s Contexts
                        \s"""
                         .formatted(
                                 surveyUnitApiPort.countResponses(),
-                                dataProcessingContextApiPort.countSchedules()
+                                dataProcessingContextApiPort.countContexts()
                         ));
     }
 
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/CampaignController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/CampaignController.java
index 9daaa129..0189e7cb 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/CampaignController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/CampaignController.java
@@ -27,6 +27,7 @@ public CampaignController(SurveyUnitApiPort surveyUnitService) {
 
     @Operation(summary = "List campaigns in database")
     @GetMapping(path = "/")
+    @Deprecated
     public ResponseEntity<Set<String>> getCampaigns() {
         Set<String> campaigns = surveyUnitService.findDistinctCampaignIds();
         return ResponseEntity.ok(campaigns);
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/InterrogationController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/InterrogationController.java
index 157d38e1..646214f6 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/InterrogationController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/InterrogationController.java
@@ -82,6 +82,7 @@ public ResponseEntity<List<InterrogationId>> getAllInterrogationIdsByCollectionI
     public ResponseEntity<Long> countAllInterrogationIdsByQuestionnaireOrCollectionInstrument(
             @Parameter(description = "questionnaireId/collectionInstrumentId", required = true) @PathVariable("questionnaireId") String questionnaireId
     ) {
+        //TODO move logic to service
         long response = surveyUnitService.countResponsesByQuestionnaireId(questionnaireId);
         response += surveyUnitService.countResponsesByCollectionInstrumentId(questionnaireId);
         return ResponseEntity.ok(response);
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/ModeController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/ModeController.java
index b782c571..09aa003e 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/ModeController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/ModeController.java
@@ -43,11 +43,13 @@ public ResponseEntity<List<Mode>> getModesByQuestionnaire(@RequestParam("collect
 
     @Operation(summary = "List sources/modes used for a given campaign")
     @GetMapping(path = "/by-campaign")
+    @Deprecated
     public ResponseEntity<List<Mode>> getModesByCampaign(@RequestParam("campaignId") String campaignId) {
         List<Mode> modes = surveyUnitService.findModesByCampaignId(campaignId);
         return ResponseEntity.ok(modes);
     }
 
+    //TODO Integrate into normal usage, not in unit test meanwhile
     //========= OPTIMISATIONS PERFS (START) ==========
     @Operation(summary = "List sources/modes used for a given questionnaire")
     @GetMapping(path = "/by-questionnaireV2")
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/QuestionnaireController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/QuestionnaireController.java
index 840685c8..4bad77fc 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/QuestionnaireController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/QuestionnaireController.java
@@ -57,6 +57,7 @@ public ResponseEntity<List<String>> getQuestionnairesWithReview(
 
     @Operation(summary = "List questionnaires in database with their campaigns")
     @GetMapping(path = "/with-campaigns")
+    @Deprecated
     public ResponseEntity<List<QuestionnaireWithCampaign>> getQuestionnairesWithCampaigns() {
         List<QuestionnaireWithCampaign> questionnaireWithCampaignList =
                 surveyUnitService.findQuestionnairesWithCampaigns();
@@ -65,6 +66,7 @@ public ResponseEntity<List<QuestionnaireWithCampaign>> getQuestionnairesWithCamp
 
     @Operation(summary = "List questionnaires used for a given campaign")
     @GetMapping(path = "/by-campaign")
+    @Deprecated
     public ResponseEntity<Set<String>> getQuestionnairesByCampaign(@RequestParam("campaignId") String campaignId) {
         Set<String> questionnaires = surveyUnitService.findQuestionnaireIdsByCampaignId(campaignId);
         return ResponseEntity.ok(questionnaires);
@@ -76,6 +78,7 @@ public ResponseEntity<Set<String>> getQuestionnairesByCampaign(@RequestParam("ca
      */
     @Operation(summary = "List questionnaires used for a given campaign (using a DISTINCT query)")
     @GetMapping(path = "/by-campaignV2")
+    @Deprecated(forRemoval = true) //TODO integrate logic to find by interrogationId
     public ResponseEntity<Set<String>> getQuestionnairesByCampaignV2(@RequestParam("campaignId") String campaignId) {
         Set<String> questionnaires = surveyUnitService.findQuestionnaireIdsByCampaignIdV2(campaignId);
         return ResponseEntity.ok(questionnaires);
@@ -92,7 +95,6 @@ public ResponseEntity<String> getQuestionnaireByInterrogation(@RequestParam("int
         } catch (GenesisException e) {
             return ResponseEntity.status(e.getStatus()).body(e.getMessage());
         }
-
     }
 
 
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
index e692852e..f9eaf681 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
@@ -64,7 +64,6 @@ public RawResponseController(LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort
     @PutMapping(path = "/responses/raw/lunatic-json/save")
     @PreAuthorize("hasRole('COLLECT_PLATFORM')")
     public ResponseEntity<String> saveRawResponsesFromJsonBody(
-
             @RequestParam("campaignName") String campaignName,
             @RequestParam("questionnaireId") String questionnaireId,
             @RequestParam(INTERROGATION_ID) String interrogationId,
@@ -99,7 +98,7 @@ public ResponseEntity<String> saveRawResponsesFromJsonBody(
     public ResponseEntity<String> saveRawResponsesFromRawResponseDto(
             @Valid @RequestBody RawResponseDto dto
     ) {
-        rawRepository.saveAsRawJson(dto);
+        rawRepository.saveAsRawJson(dto); //TODO put in service, repository is infra layer
         return ResponseEntity.status(201).body(String.format(SUCCESS_MESSAGE, dto.getInterrogationId()));
     }
 
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
index 11da759b..bc700385 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
@@ -301,6 +301,7 @@ public ResponseEntity<SurveyUnitSimplifiedDto> getLatestByInterrogationOneObject
         LocalDateTime validationDate = null;
         for (SurveyUnitModel response :
                 responses.stream().filter(rep -> rep.getMode().equals(mode)).toList()){
+            //Keep last not null questionnaireState/validationDate
             questionnaireState = response.getQuestionnaireState() != null ?
                     response.getQuestionnaireState()
                     : questionnaireState;
@@ -426,7 +427,7 @@ public ResponseEntity<Object> saveEditedVariables(
     ) {
         try {
             log.debug("Received in save edited : {}", surveyUnitInputDto.toString());
-            //Code quality : we need to put all that logic out of this controller
+            //TODO Code quality : we need to put all that logic out of this controller
             //Parse metadata
             //Try to look for DDI first, if no DDI found looks for lunatic components
             List<GenesisError> errors = new ArrayList<>();
diff --git a/src/main/java/fr/insee/genesis/domain/model/surveyunit/DataType.java b/src/main/java/fr/insee/genesis/domain/model/surveyunit/DataType.java
index 665cac27..332d48a3 100644
--- a/src/main/java/fr/insee/genesis/domain/model/surveyunit/DataType.java
+++ b/src/main/java/fr/insee/genesis/domain/model/surveyunit/DataType.java
@@ -1,5 +1,9 @@
 package fr.insee.genesis.domain.model.surveyunit;
 
+/**
+ * @deprecated unused
+ */
+@Deprecated(forRemoval = true)
 public enum DataType {
     COLLECTED,CALCULATED,EXTERNAL
 }
diff --git a/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java b/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java
index fdd87038..f51e92a2 100644
--- a/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java
+++ b/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java
@@ -1,11 +1,13 @@
 package fr.insee.genesis.domain.model.surveyunit.rawdata;
 
 import fr.insee.genesis.domain.model.surveyunit.Mode;
+import lombok.Builder;
 import org.bson.types.ObjectId;
 
 import java.time.LocalDateTime;
 import java.util.Map;
 
+@Builder
 public record RawResponseModel(
         ObjectId id,
         String interrogationId,
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/DataProcessingContextApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/DataProcessingContextApiPort.java
index e6b6602f..4fdb809f 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/api/DataProcessingContextApiPort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/api/DataProcessingContextApiPort.java
@@ -38,7 +38,7 @@ void saveKraftwerkExecutionScheduleByCollectionInstrumentId(String collectionIns
 
     void deleteExpiredSchedules(String logFolder) throws GenesisException;
 
-    long countSchedules();
+    long countContexts();
 
     DataProcessingContextModel getContext(String interrogationId) throws GenesisException;
 
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java
index 2031d80d..c39737e7 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java
@@ -20,6 +20,7 @@
 public interface LunaticJsonRawDataApiPort {
 
     void save(LunaticJsonRawDataModel rawData);
+    @Deprecated
     List<LunaticJsonRawDataModel> getRawData(String campaignName, Mode mode, List<String> interrogationIdList);
     List<LunaticJsonRawDataModel> getRawDataByQuestionnaireId(String questionnaireId, Mode mode, List<String> interrogationIdList);
     List<SurveyUnitModel> convertRawData(List<LunaticJsonRawDataModel> rawData, VariablesMap variablesMap);
@@ -27,8 +28,10 @@ public interface LunaticJsonRawDataApiPort {
     Set<String> getUnprocessedDataQuestionnaireIds();
     void updateProcessDates(List<SurveyUnitModel> surveyUnitModels);
     Set<String> findDistinctQuestionnaireIds();
+    @Deprecated
     long countRawResponsesByQuestionnaireId(String campaignId);
     long countDistinctInterrogationIdsByQuestionnaireId(String questionnaireId);
+    @Deprecated
     Page<LunaticJsonRawDataModel> findRawDataByCampaignIdAndDate(String campaignId, Instant  startDt, Instant endDt, Pageable pageable);
 
     List<LunaticJsonRawDataModel> getRawDataByInterrogationId(String interrogationId);
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java
index 7362cc51..781fe08f 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java
@@ -65,6 +65,7 @@ List<InterrogationId> findDistinctPageableInterrogationIdsByQuestionnaireId(Stri
 
     List<Mode> findModesByCollectionInstrumentId(String collectionInstrumentId);
 
+    @Deprecated
     List<Mode> findModesByCampaignId(String campaignId);
 
     //========= OPTIMISATIONS PERFS (START) ==========
@@ -102,6 +103,7 @@ List<SurveyUnitModel> parseEditedVariables(SurveyUnitInputDto surveyUnitInputDto
 
     String findQuestionnaireIdByInterrogationId(String interrogationId) throws GenesisException;
 
+    @Deprecated
     Set<String> findCampaignIdsFrom(SurveyUnitInputDto dto);
 
     long countResponsesByQuestionnaireId(String questionnaireId);
diff --git a/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java b/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java
index e8bbadb3..ccf42024 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java
@@ -17,7 +17,7 @@ public interface LunaticJsonRawDataPersistencePort {
     List<LunaticJsonRawDataModel> findRawData(String campaignName, Mode mode, List<String> interrogationIdList);
     List<LunaticJsonRawDataModel> findRawDataByQuestionnaireId(String questionnaireId, Mode mode, List<String> interrogationIdList);
     Page<LunaticJsonRawDataModel> findRawDataByQuestionnaireId(String questionnaireId, Pageable pageable);
-    List<LunaticJsonRawDataModel> findRawDataByInterrogationID(String interrogationId);
+    List<LunaticJsonRawDataModel> findRawDataByInterrogationId(String interrogationId);
     List<LunaticJsonRawDataModel> getAllUnprocessedData();
     void updateProcessDates(String campaignId, Set<String> interrogationIds);
     Set<String> findDistinctQuestionnaireIds();
diff --git a/src/main/java/fr/insee/genesis/domain/service/context/DataProcessingContextService.java b/src/main/java/fr/insee/genesis/domain/service/context/DataProcessingContextService.java
index 43cfb563..1ecd84c6 100644
--- a/src/main/java/fr/insee/genesis/domain/service/context/DataProcessingContextService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/context/DataProcessingContextService.java
@@ -43,7 +43,11 @@ public DataProcessingContextService(DataProcessingContextPersistancePort dataPro
         this.surveyUnitPersistencePort = surveyUnitPersistencePort;
     }
 
+    /**
+     * @Deprecated Use collectionInstrumentId instead
+     */
     @Override
+    @Deprecated(forRemoval = true)
     public void saveContext(String partitionId, Boolean withReview) throws GenesisException {
 
         DataProcessingContextModel dataProcessingContextModel =
@@ -104,7 +108,11 @@ public void saveKraftwerkExecutionSchedule(String partitionId,
         dataProcessingContextPersistancePort.save(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
     }
 
+    /**
+     * @Deprecated Will be replaced by Bangles V1
+     */
     @Override
+    @Deprecated
     public void saveKraftwerkExecutionScheduleByCollectionInstrumentId(String collectionInstrumentId, ServiceToCall serviceToCall, String frequency, LocalDateTime startDate, LocalDateTime endDate, TrustParameters trustParameters) throws GenesisException {
         DataProcessingContextModel dataProcessingContextModel = dataProcessingContextPersistancePort.findByCollectionInstrumentId(collectionInstrumentId);
         if(dataProcessingContextModel == null){
@@ -141,7 +149,11 @@ public void updateLastExecutionDate(String partitionId, LocalDateTime newDate) t
         dataProcessingContextPersistancePort.save(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
     }
 
+    /**
+     * @Deprecated Will be replaced by Bangles V1
+     */
     @Override
+    @Deprecated
     public void updateLastExecutionDateByCollectionInstrumentId(String collectionInstrumentId, LocalDateTime newDate) throws GenesisException {
         DataProcessingContextModel dataProcessingContextModel = dataProcessingContextPersistancePort.findByCollectionInstrumentId(collectionInstrumentId);
         if (dataProcessingContextModel == null) {
@@ -151,7 +163,11 @@ public void updateLastExecutionDateByCollectionInstrumentId(String collectionIns
         dataProcessingContextPersistancePort.save(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
     }
 
+    /**
+     * @Deprecated Will be replaced by Bangles V1 + partitionId is obsolete
+     */
     @Override
+    @Deprecated(forRemoval = true)
     public void deleteSchedules(String partitionId) throws GenesisException {
         DataProcessingContextModel dataProcessingContextModel =
                 DataProcessingContextMapper.INSTANCE.documentToModel(
@@ -164,7 +180,11 @@ public void deleteSchedules(String partitionId) throws GenesisException {
         dataProcessingContextPersistancePort.save(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
     }
 
+    /**
+     * @Deprecated Will be replaced by Bangles V1
+     */
     @Override
+    @Deprecated
     public void deleteSchedulesByCollectionInstrumentId(String collectionInstrumentId) throws GenesisException {
         DataProcessingContextModel dataProcessingContextModel =
                         dataProcessingContextPersistancePort.findByCollectionInstrumentId(collectionInstrumentId);
@@ -175,7 +195,11 @@ public void deleteSchedulesByCollectionInstrumentId(String collectionInstrumentI
         dataProcessingContextPersistancePort.save(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
     }
 
+    /**
+     * @Deprecated Will be replaced by Bangles V1
+     */
     @Override
+    @Deprecated
     public List<ScheduleDto> getAllSchedules() {
         List<ScheduleDto> scheduleDtos = new ArrayList<>();
 
@@ -189,7 +213,11 @@ public List<ScheduleDto> getAllSchedules() {
         return scheduleDtos;
     }
 
+    /**
+     * @Deprecated Will be replaced by Bangles V1
+     */
     @Override
+    @Deprecated
     public void deleteExpiredSchedules(String logFolder) throws GenesisException {
         List<DataProcessingContextModel> dataProcessingContextModels =
                 DataProcessingContextMapper.INSTANCE.listDocumentToListModel(dataProcessingContextPersistancePort.findAll());
@@ -225,7 +253,7 @@ public void deleteExpiredSchedules(String logFolder) throws GenesisException {
     }
 
     @Override
-    public long countSchedules() {
+    public long countContexts() {
         return dataProcessingContextPersistancePort.count();
     }
 
@@ -259,6 +287,9 @@ public DataProcessingContextModel getContextByCollectionInstrumentId(String coll
         return dataProcessingContextPersistancePort.findByCollectionInstrumentId(collectionInstrumentId);
     }
 
+    /**
+     * @deprecated PartitionId is obsolete since modele filiere
+     */
     @Override
     @Deprecated(forRemoval = true)
     public List<String> getPartitionIds(boolean withReview){
@@ -286,6 +317,9 @@ public List<String> getCollectionInstrumentIds(boolean withReview) {
         return collectionInstrumentIds;
     }
 
+    /**
+     * @deprecated PartitionId is obsolete since modele filiere
+     */
     @Deprecated(forRemoval = true)
     @Override
     public boolean getReviewByPartitionId(String partitionId) throws GenesisException {
diff --git a/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java b/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java
index 2e254a87..c2e44b42 100644
--- a/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 @Service
-@AllArgsConstructor
+ @AllArgsConstructor
 @Slf4j
 public class QuestionnaireMetadataService implements QuestionnaireMetadataApiPort {
     private static final String DDI_FILE_PATTERN = "ddi[\\w,\\s-]+\\.xml";
@@ -45,6 +45,7 @@ public MetadataModel find(String collectionInstrumentId, Mode mode) throws Genes
     }
 
     @Override
+    //TODO remove campaignName
     public MetadataModel loadAndSaveIfNotExists(String campaignName, String collectionInstrumentId, Mode mode, FileUtils fileUtils,
                                                 List<GenesisError> errors) throws GenesisException {
         List<QuestionnaireMetadataModel> questionnaireMetadataModels =
@@ -99,7 +100,8 @@ private MetadataModel readMetadatas(String campaignName, String modeName, FileUt
             try {
                 lunaticFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), LUNATIC_FILE_PATTERN);
                 return parseMetadata(lunaticFilePath, null);
-            } catch (Exception ex) {
+            } //TODO remove error if java.nio.file.NoSuchFileException to avoid log spam
+            catch (Exception ex) {
                 log.error("Error reading Lunatic metadata file", ex);
                 errors.add(new GenesisError(ex.toString()));
                 return null;
diff --git a/src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java b/src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java
index a6f4e28a..782ca741 100644
--- a/src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java
@@ -15,6 +15,7 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
+//TODO create API port interface
 public class CombinedRawDataService {
 
     @Qualifier("lunaticJsonMongoAdapter")
@@ -28,7 +29,7 @@ public CombinedRawDataDto getCombinedRawDataByInterrogationId(String interrogati
                 rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId);
 
         List<LunaticJsonRawDataModel> lunaticRawDataModels =
-                lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId);
+                lunaticJsonRawDataPersistencePort.findRawDataByInterrogationId(interrogationId);
 
         return new CombinedRawDataDto(
                 rawResponseModels,
diff --git a/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java b/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java
index 15abc3e2..0430cdd1 100644
--- a/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java
@@ -97,6 +97,7 @@ public void save(LunaticJsonRawDataModel rawData) {
     }
 
     @Override
+    @Deprecated
     public List<LunaticJsonRawDataModel> getRawData(String campaignName, Mode mode, List<String> interrogationIdList) {
         return lunaticJsonRawDataPersistencePort.findRawData(campaignName, mode, interrogationIdList);
     }
@@ -108,7 +109,7 @@ public List<LunaticJsonRawDataModel> getRawDataByQuestionnaireId(String question
 
     @Override    
     public List<LunaticJsonRawDataModel> getRawDataByInterrogationId(String interrogationId) {
-        return lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId);
+        return lunaticJsonRawDataPersistencePort.findRawDataByInterrogationId(interrogationId);
     }
 
     @Override
@@ -577,6 +578,7 @@ public boolean existsByInterrogationId(String interrogationId) {
     }
 
     @Override
+    @Deprecated
     public Page<LunaticJsonRawDataModel> findRawDataByCampaignIdAndDate(String campaignId, Instant startDt, Instant endDt, Pageable pageable){
         return lunaticJsonRawDataPersistencePort.findByCampaignIdAndDate(campaignId,startDt, endDt,pageable);
 
diff --git a/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java b/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java
index 9635a4f1..020da6c8 100644
--- a/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java
@@ -233,7 +233,7 @@ public List<SurveyUnitModel> convertRawResponse(List<RawResponseModel> rawRespon
                     questionnaireStateEnum = RawResponseDto.QuestionnaireStateEnum.valueOf(questionnaireStateString);
                 } catch (IllegalArgumentException iae){
                     log.warn("'{}' is not a valid questionnaire state according to filiere model", questionnaireStateString);
-                }
+                } catch (NullPointerException ignored){} //WARN already done in getStringFieldInPayload
                 LocalDateTime validationDate = getValidationDate(rawResponseModel);
                 String usualSurveyUnitId = getStringFieldInPayload(rawResponseModel,"usualSurveyUnitId");
                 String majorModelVersion = getStringFieldInPayload(rawResponseModel, "majorModelVersion");
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java
index cd12f109..6379c3f9 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java
@@ -79,7 +79,7 @@ public Page<LunaticJsonRawDataModel> findRawDataByQuestionnaireId(String questio
     }
 
     @Override
-    public List<LunaticJsonRawDataModel> findRawDataByInterrogationID(String interrogationId) {
+    public List<LunaticJsonRawDataModel> findRawDataByInterrogationId(String interrogationId) {
         List<LunaticJsonRawDataDocument> rawDataDocs = repository.findByInterrogationId(interrogationId);
         return LunaticJsonRawDataDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs);
     }
diff --git a/src/test/java/cucumber/functional_tests/DataProcessingContextDefinitions.java b/src/test/java/cucumber/functional_tests/DataProcessingContextDefinitions.java
index 35011b41..0025c9b7 100644
--- a/src/test/java/cucumber/functional_tests/DataProcessingContextDefinitions.java
+++ b/src/test/java/cucumber/functional_tests/DataProcessingContextDefinitions.java
@@ -8,9 +8,9 @@
 import fr.insee.genesis.exceptions.GenesisException;
 import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
+import cucumber.stubs.ConfigStub;
+import cucumber.stubs.DataProcessingContextPersistancePortStub;
+import cucumber.stubs.SurveyUnitPersistencePortStub;
 import io.cucumber.java.Before;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
diff --git a/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java b/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
index 16e9c0cd..b6932ae9 100644
--- a/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
+++ b/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
@@ -14,11 +14,11 @@
 import fr.insee.genesis.domain.utils.JsonUtils;
 import fr.insee.genesis.infrastructure.document.lunaticmodel.LunaticModelDocument;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.LunaticModelPersistanceStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
+import cucumber.stubs.ConfigStub;
+import cucumber.stubs.DataProcessingContextPersistancePortStub;
+import cucumber.stubs.LunaticModelPersistanceStub;
+import cucumber.stubs.QuestionnaireMetadataPersistencePortStub;
+import cucumber.stubs.SurveyUnitPersistencePortStub;
 import io.cucumber.java.Before;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
diff --git a/src/test/java/cucumber/functional_tests/MainDefinitions.java b/src/test/java/cucumber/functional_tests/MainDefinitions.java
index 4f92755d..53fca74a 100644
--- a/src/test/java/cucumber/functional_tests/MainDefinitions.java
+++ b/src/test/java/cucumber/functional_tests/MainDefinitions.java
@@ -29,10 +29,10 @@
 import fr.insee.genesis.exceptions.GenesisException;
 import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
+import cucumber.stubs.ConfigStub;
+import cucumber.stubs.DataProcessingContextPersistancePortStub;
+import cucumber.stubs.QuestionnaireMetadataPersistencePortStub;
+import cucumber.stubs.SurveyUnitPersistencePortStub;
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
 import io.cucumber.java.en.Given;
diff --git a/src/test/java/cucumber/functional_tests/RawDataDefinitions.java b/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
index 8c1790ea..8fca29e8 100644
--- a/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
+++ b/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
@@ -23,12 +23,12 @@
 import fr.insee.genesis.exceptions.GenesisException;
 import fr.insee.genesis.infrastructure.repository.RawResponseInputRepository;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.LunaticJsonRawDataPersistanceStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitQualityToolPerretAdapterStub;
+import cucumber.stubs.ConfigStub;
+import cucumber.stubs.DataProcessingContextPersistancePortStub;
+import cucumber.stubs.LunaticJsonRawDataPersistanceStub;
+import cucumber.stubs.QuestionnaireMetadataPersistencePortStub;
+import cucumber.stubs.SurveyUnitPersistencePortStub;
+import cucumber.stubs.SurveyUnitQualityToolPerretAdapterStub;
 import fr.insee.modelefiliere.RawResponseDto;
 import io.cucumber.java.Before;
 import io.cucumber.java.en.Given;
diff --git a/src/test/java/fr/insee/genesis/stubs/ConfigStub.java b/src/test/java/cucumber/stubs/ConfigStub.java
similarity index 96%
rename from src/test/java/fr/insee/genesis/stubs/ConfigStub.java
rename to src/test/java/cucumber/stubs/ConfigStub.java
index 9f414c44..360953bc 100644
--- a/src/test/java/fr/insee/genesis/stubs/ConfigStub.java
+++ b/src/test/java/cucumber/stubs/ConfigStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 
 import fr.insee.genesis.TestConstants;
diff --git a/src/test/java/fr/insee/genesis/stubs/ContextualExternalVariablePersistancePortStub.java b/src/test/java/cucumber/stubs/ContextualExternalVariablePersistancePortStub.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/stubs/ContextualExternalVariablePersistancePortStub.java
rename to src/test/java/cucumber/stubs/ContextualExternalVariablePersistancePortStub.java
index 7e31e527..e7bc4da9 100644
--- a/src/test/java/fr/insee/genesis/stubs/ContextualExternalVariablePersistancePortStub.java
+++ b/src/test/java/cucumber/stubs/ContextualExternalVariablePersistancePortStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.Constants;
 import fr.insee.genesis.domain.model.contextualvariable.ContextualExternalVariableModel;
diff --git a/src/test/java/fr/insee/genesis/stubs/ContextualPreviousVariablePersistancePortStub.java b/src/test/java/cucumber/stubs/ContextualPreviousVariablePersistancePortStub.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/stubs/ContextualPreviousVariablePersistancePortStub.java
rename to src/test/java/cucumber/stubs/ContextualPreviousVariablePersistancePortStub.java
index 3fa59bbd..cc12f6c1 100644
--- a/src/test/java/fr/insee/genesis/stubs/ContextualPreviousVariablePersistancePortStub.java
+++ b/src/test/java/cucumber/stubs/ContextualPreviousVariablePersistancePortStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.Constants;
 import fr.insee.genesis.domain.model.contextualvariable.ContextualPreviousVariableModel;
diff --git a/src/test/java/fr/insee/genesis/stubs/DataProcessingContextPersistancePortStub.java b/src/test/java/cucumber/stubs/DataProcessingContextPersistancePortStub.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/stubs/DataProcessingContextPersistancePortStub.java
rename to src/test/java/cucumber/stubs/DataProcessingContextPersistancePortStub.java
index 528e4a33..65053a57 100644
--- a/src/test/java/fr/insee/genesis/stubs/DataProcessingContextPersistancePortStub.java
+++ b/src/test/java/cucumber/stubs/DataProcessingContextPersistancePortStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
 import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
diff --git a/src/test/java/fr/insee/genesis/stubs/LastJsonExtractionPersistencePortStub.java b/src/test/java/cucumber/stubs/LastJsonExtractionPersistencePortStub.java
similarity index 97%
rename from src/test/java/fr/insee/genesis/stubs/LastJsonExtractionPersistencePortStub.java
rename to src/test/java/cucumber/stubs/LastJsonExtractionPersistencePortStub.java
index 9081ff59..518c9f40 100644
--- a/src/test/java/fr/insee/genesis/stubs/LastJsonExtractionPersistencePortStub.java
+++ b/src/test/java/cucumber/stubs/LastJsonExtractionPersistencePortStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.extraction.json.LastJsonExtractionModel;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
diff --git a/src/test/java/fr/insee/genesis/stubs/LunaticJsonMongoDBRepositoryStub.java b/src/test/java/cucumber/stubs/LunaticJsonMongoDBRepositoryStub.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/stubs/LunaticJsonMongoDBRepositoryStub.java
rename to src/test/java/cucumber/stubs/LunaticJsonMongoDBRepositoryStub.java
index 2c0e4dc7..d080a763 100644
--- a/src/test/java/fr/insee/genesis/stubs/LunaticJsonMongoDBRepositoryStub.java
+++ b/src/test/java/cucumber/stubs/LunaticJsonMongoDBRepositoryStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
diff --git a/src/test/java/fr/insee/genesis/stubs/LunaticJsonRawDataPersistanceStub.java b/src/test/java/cucumber/stubs/LunaticJsonRawDataPersistanceStub.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/stubs/LunaticJsonRawDataPersistanceStub.java
rename to src/test/java/cucumber/stubs/LunaticJsonRawDataPersistanceStub.java
index 9f32a324..21b506fb 100644
--- a/src/test/java/fr/insee/genesis/stubs/LunaticJsonRawDataPersistanceStub.java
+++ b/src/test/java/cucumber/stubs/LunaticJsonRawDataPersistanceStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.surveyunit.GroupedInterrogation;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
@@ -94,7 +94,7 @@ public Page<LunaticJsonRawDataModel> findRawDataByQuestionnaireId(String questio
 
 
     @Override
-    public List<LunaticJsonRawDataModel> findRawDataByInterrogationID(String interrogationId) {
+    public List<LunaticJsonRawDataModel> findRawDataByInterrogationId(String interrogationId) {
         List<LunaticJsonRawDataDocument> docs = mongoStub.stream()
                 .filter(doc -> interrogationId.equals(doc.interrogationId()))
                 .toList();
diff --git a/src/test/java/fr/insee/genesis/stubs/LunaticModelPersistanceStub.java b/src/test/java/cucumber/stubs/LunaticModelPersistanceStub.java
similarity index 97%
rename from src/test/java/fr/insee/genesis/stubs/LunaticModelPersistanceStub.java
rename to src/test/java/cucumber/stubs/LunaticModelPersistanceStub.java
index 8b0ca13d..df2daaf6 100644
--- a/src/test/java/fr/insee/genesis/stubs/LunaticModelPersistanceStub.java
+++ b/src/test/java/cucumber/stubs/LunaticModelPersistanceStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.lunaticmodel.LunaticModelModel;
 import fr.insee.genesis.domain.ports.spi.LunaticModelPersistancePort;
diff --git a/src/test/java/fr/insee/genesis/stubs/QuestionnaireMetadataPersistencePortStub.java b/src/test/java/cucumber/stubs/QuestionnaireMetadataPersistencePortStub.java
similarity index 98%
rename from src/test/java/fr/insee/genesis/stubs/QuestionnaireMetadataPersistencePortStub.java
rename to src/test/java/cucumber/stubs/QuestionnaireMetadataPersistencePortStub.java
index accf752f..1d29bda6 100644
--- a/src/test/java/fr/insee/genesis/stubs/QuestionnaireMetadataPersistencePortStub.java
+++ b/src/test/java/cucumber/stubs/QuestionnaireMetadataPersistencePortStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.metadata.QuestionnaireMetadataModel;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
diff --git a/src/test/java/fr/insee/genesis/stubs/RawResponseDataPersistanceStub.java b/src/test/java/cucumber/stubs/RawResponseDataPersistanceStub.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/stubs/RawResponseDataPersistanceStub.java
rename to src/test/java/cucumber/stubs/RawResponseDataPersistanceStub.java
index 697a57d0..174587e9 100644
--- a/src/test/java/fr/insee/genesis/stubs/RawResponseDataPersistanceStub.java
+++ b/src/test/java/cucumber/stubs/RawResponseDataPersistanceStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
diff --git a/src/test/java/cucumber/stubs/RundeckExecutionApiPortStub.java b/src/test/java/cucumber/stubs/RundeckExecutionApiPortStub.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/java/fr/insee/genesis/stubs/RundeckExecutionPersistencePortStub.java b/src/test/java/cucumber/stubs/RundeckExecutionPersistencePortStub.java
similarity index 95%
rename from src/test/java/fr/insee/genesis/stubs/RundeckExecutionPersistencePortStub.java
rename to src/test/java/cucumber/stubs/RundeckExecutionPersistencePortStub.java
index b312c1c3..36112431 100644
--- a/src/test/java/fr/insee/genesis/stubs/RundeckExecutionPersistencePortStub.java
+++ b/src/test/java/cucumber/stubs/RundeckExecutionPersistencePortStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.rundeck.RundeckExecution;
 import fr.insee.genesis.domain.ports.spi.RundeckExecutionPersistencePort;
diff --git a/src/test/java/fr/insee/genesis/stubs/SurveyUnitPersistencePortStub.java b/src/test/java/cucumber/stubs/SurveyUnitPersistencePortStub.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/stubs/SurveyUnitPersistencePortStub.java
rename to src/test/java/cucumber/stubs/SurveyUnitPersistencePortStub.java
index 65f5ddd6..dae8b39a 100644
--- a/src/test/java/fr/insee/genesis/stubs/SurveyUnitPersistencePortStub.java
+++ b/src/test/java/cucumber/stubs/SurveyUnitPersistencePortStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.ports.spi.SurveyUnitPersistencePort;
diff --git a/src/test/java/fr/insee/genesis/stubs/SurveyUnitQualityToolPerretAdapterStub.java b/src/test/java/cucumber/stubs/SurveyUnitQualityToolPerretAdapterStub.java
similarity index 95%
rename from src/test/java/fr/insee/genesis/stubs/SurveyUnitQualityToolPerretAdapterStub.java
rename to src/test/java/cucumber/stubs/SurveyUnitQualityToolPerretAdapterStub.java
index 683c72b5..d346936a 100644
--- a/src/test/java/fr/insee/genesis/stubs/SurveyUnitQualityToolPerretAdapterStub.java
+++ b/src/test/java/cucumber/stubs/SurveyUnitQualityToolPerretAdapterStub.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.stubs;
+package cucumber.stubs;
 
 import fr.insee.genesis.domain.ports.spi.SurveyUnitQualityToolPort;
 import lombok.Getter;
diff --git a/src/test/java/fr/insee/genesis/controller/rest/ControllerAccessTest.java b/src/test/java/fr/insee/genesis/ControllerAccessTest.java
similarity index 99%
rename from src/test/java/fr/insee/genesis/controller/rest/ControllerAccessTest.java
rename to src/test/java/fr/insee/genesis/ControllerAccessTest.java
index d8647c9d..3e9942c1 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/ControllerAccessTest.java
+++ b/src/test/java/fr/insee/genesis/ControllerAccessTest.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.controller.rest;
+package fr.insee.genesis;
 
 import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
 import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
diff --git a/src/test/java/fr/insee/genesis/TestConstants.java b/src/test/java/fr/insee/genesis/TestConstants.java
index d5877ed0..54fb913d 100644
--- a/src/test/java/fr/insee/genesis/TestConstants.java
+++ b/src/test/java/fr/insee/genesis/TestConstants.java
@@ -1,8 +1,15 @@
 package fr.insee.genesis;
 
+import fr.insee.genesis.configuration.Config;
+import lombok.experimental.UtilityClass;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
 /**
  * Class to create static variables giving path for test resources.
  */
+@UtilityClass
 public class TestConstants {
 
 	public static final String TEST_RESOURCES_DIRECTORY = "src/test/resources";
@@ -19,4 +26,16 @@ public class TestConstants {
     public static final String FUNCTIONAL_TESTS_TEMP_DIRECTORY = TEST_RESOURCES_DIRECTORY + "/functional_tests/temp";
     public static final String FUNCTIONAL_TESTS_OUTPUT_DIRECTORY = TEST_RESOURCES_DIRECTORY + "/functional_tests/out";
     public static final String FUNCTIONAL_TESTS_API_URL = "http://localhost:8080";
+
+    public static Config getConfigStub(){
+        Config configStub = mock(Config.class);
+
+        doReturn(TEST_RESOURCES_DIRECTORY).when(configStub).getDataFolderSource();
+        doReturn(TEST_RESOURCES_DIRECTORY).when(configStub).getSpecFolderSource();
+        doReturn(TEST_RESOURCES_DIRECTORY).when(configStub).getLogFolder();
+        doReturn("NONE").when(configStub).getAuthType();
+        doReturn(1000).when(configStub).getRawDataProcessingBatchSize();
+
+        return configStub;
+    }
 }
diff --git a/src/test/java/fr/insee/genesis/controller/adapter/LunaticJsonAdapterTest.java b/src/test/java/fr/insee/genesis/controller/adapter/LunaticJsonAdapterTest.java
new file mode 100644
index 00000000..568781f5
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/controller/adapter/LunaticJsonAdapterTest.java
@@ -0,0 +1,128 @@
+package fr.insee.genesis.controller.adapter;
+
+import fr.insee.genesis.controller.sources.json.LunaticJsonSurveyUnit;
+import fr.insee.genesis.domain.model.surveyunit.DataState;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("LunaticJsonAdapter tests")
+class LunaticJsonAdapterTest {
+
+    private final LunaticJsonAdapter adapter = new LunaticJsonAdapter();
+
+    @Nested
+    @DisplayName("convert() tests")
+    class ConvertTests {
+
+        @Test
+        @DisplayName("Should map questionnaireId to collectionInstrumentId")
+        void convert_shouldMapQuestionnaireIdToCollectionInstrumentId() {
+            // GIVEN
+            LunaticJsonSurveyUnit su = buildSurveyUnit("questionnaire-123", "interrogation-456");
+
+            // WHEN
+            SurveyUnitModel result = adapter.convert(su);
+
+            // THEN
+            assertThat(result.getCollectionInstrumentId()).isEqualTo("questionnaire-123");
+        }
+
+        @Test
+        @DisplayName("Should map interrogationId")
+        void convert_shouldMapInterrogationId() {
+            // GIVEN
+            LunaticJsonSurveyUnit su = buildSurveyUnit("questionnaire-123", "interrogation-456");
+
+            // WHEN
+            SurveyUnitModel result = adapter.convert(su);
+
+            // THEN
+            assertThat(result.getInterrogationId()).isEqualTo("interrogation-456");
+        }
+
+        @Test
+        @DisplayName("Should set state to COLLECTED")
+        void convert_shouldSetStateToCollected() {
+            // GIVEN
+            LunaticJsonSurveyUnit su = buildSurveyUnit("q1", "i1");
+
+            // WHEN
+            SurveyUnitModel result = adapter.convert(su);
+
+            // THEN
+            assertThat(result.getState()).isEqualTo(DataState.COLLECTED);
+        }
+
+        @Test
+        @DisplayName("Should set mode to WEB")
+        void convert_shouldSetModeToWeb() {
+            // GIVEN
+            LunaticJsonSurveyUnit su = buildSurveyUnit("q1", "i1");
+
+            // WHEN
+            SurveyUnitModel result = adapter.convert(su);
+
+            // THEN
+            assertThat(result.getMode()).isEqualTo(Mode.WEB);
+        }
+
+        @Test
+        @DisplayName("Should set campaignId to empty string")
+        void convert_shouldSetCampaignIdToEmptyString() {
+            // GIVEN
+            LunaticJsonSurveyUnit su = buildSurveyUnit("q1", "i1");
+
+            // WHEN
+            SurveyUnitModel result = adapter.convert(su);
+
+            // THEN
+            assertThat(result.getCampaignId()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should set a non-null recordDate close to now")
+        void convert_shouldSetRecordDateCloseToNow() {
+            // GIVEN
+            LunaticJsonSurveyUnit su = buildSurveyUnit("q1", "i1");
+            LocalDateTime before = LocalDateTime.now();
+
+            // WHEN
+            SurveyUnitModel result = adapter.convert(su);
+
+            // THEN
+            LocalDateTime after = LocalDateTime.now();
+            assertThat(result.getRecordDate())
+                    .isNotNull()
+                    .isAfterOrEqualTo(before)
+                    .isBeforeOrEqualTo(after);
+        }
+
+        @Test
+        @DisplayName("Should return a non-null model")
+        void convert_shouldReturnNonNullModel() {
+            // GIVEN
+            LunaticJsonSurveyUnit su = buildSurveyUnit("q1", "i1");
+
+            // WHEN
+            SurveyUnitModel result = adapter.convert(su);
+
+            // THEN
+            assertThat(result).isNotNull();
+        }
+    }
+
+    //UTILS
+    private LunaticJsonSurveyUnit buildSurveyUnit(String questionnaireId, String interrogationId) {
+        LunaticJsonSurveyUnit su = new LunaticJsonSurveyUnit();
+        su.setQuestionnaireId(questionnaireId);
+        su.setInterrogationId(interrogationId);
+        return su;
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/adapter/LunaticXmlAdapterTest.java b/src/test/java/fr/insee/genesis/controller/adapter/LunaticXmlAdapterTest.java
index ac62bd65..868b67b7 100644
--- a/src/test/java/fr/insee/genesis/controller/adapter/LunaticXmlAdapterTest.java
+++ b/src/test/java/fr/insee/genesis/controller/adapter/LunaticXmlAdapterTest.java
@@ -1,402 +1,520 @@
 package fr.insee.genesis.controller.adapter;
 
-
-import fr.insee.bpm.metadata.model.Group;
-import fr.insee.bpm.metadata.model.MetadataModel;
-import fr.insee.bpm.metadata.model.Variable;
-import fr.insee.bpm.metadata.model.VariableType;
-import fr.insee.genesis.Constants;
-import fr.insee.genesis.controller.sources.xml.*;
+import fr.insee.bpm.metadata.model.VariablesMap;
+import fr.insee.genesis.controller.sources.xml.LunaticXmlCollectedData;
+import fr.insee.genesis.controller.sources.xml.LunaticXmlOtherData;
+import fr.insee.genesis.controller.sources.xml.LunaticXmlSurveyUnit;
+import fr.insee.genesis.controller.sources.xml.ValueType;
 import fr.insee.genesis.domain.model.surveyunit.DataState;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.model.surveyunit.VariableModel;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Optional;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("LunaticXmlAdapter tests")
 class LunaticXmlAdapterTest {
 
-    private static final String LOOP_NAME = "BOUCLE1";
-    private static final String CAMPAIGN_ID = "CAMPAIGN_ID";
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit1 = new LunaticXmlSurveyUnit();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit2 = new LunaticXmlSurveyUnit();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit3 = new LunaticXmlSurveyUnit();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit4 = new LunaticXmlSurveyUnit();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit5 = new LunaticXmlSurveyUnit();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit6 = new LunaticXmlSurveyUnit();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit7 = new LunaticXmlSurveyUnit();
-    MetadataModel metadataModel = new MetadataModel();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit8 = new LunaticXmlSurveyUnit();
-    LunaticXmlSurveyUnit lunaticXmlSurveyUnit9 = new LunaticXmlSurveyUnit();
-
-    @BeforeEach
-    void setUp() {
-        //Given
-        //SurveyUnit 1 : Only collected data
-        LunaticXmlData lunaticXmlData = new LunaticXmlData();
-        LunaticXmlCollectedData lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-        LunaticXmlCollectedData lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var2");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("3", "string"), new ValueType("4", "string")));
-        List<LunaticXmlCollectedData> collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2);
-        lunaticXmlData.setCollected(collected);
-        List<LunaticXmlOtherData> external = List.of();
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit1.setId("interrogationId1");
-        lunaticXmlSurveyUnit1.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit1.setData(lunaticXmlData);
-
-        //SurveyUnit 2 : COLLECTED + EDITED
-        lunaticXmlData = new LunaticXmlData();
-
-        lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-        lunaticXmlCollectedData.setEdited(List.of(new ValueType("1e", "string"), new ValueType("2e", "string")));
-
-        lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var2");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("3", "string"), new ValueType("4", "string")));
-        collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2);
-        lunaticXmlData.setCollected(collected);
-
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit2.setId("interrogationId1");
-        lunaticXmlSurveyUnit2.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit2.setData(lunaticXmlData);
-
-        //SurveyUnit 3 : COLLECTED + EDITED + FORCED
-        lunaticXmlData = new LunaticXmlData();
-
-        lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-        lunaticXmlCollectedData.setEdited(List.of(new ValueType("1e", "string"), new ValueType("2e", "string")));
-
-        lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var2");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("3", "string"), new ValueType("4", "string")));
-        lunaticXmlCollectedData2.setForced(List.of(new ValueType("3f", "string"), new ValueType("4f", "string")));
-        collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2);
-        lunaticXmlData.setCollected(collected);
-
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit3.setId("interrogationId1");
-        lunaticXmlSurveyUnit3.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit3.setData(lunaticXmlData);
-
-        //SurveyUnit 4 : COLLECTED + EDITED + PREVIOUS
-        lunaticXmlData = new LunaticXmlData();
-
-        lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-        lunaticXmlCollectedData.setEdited(List.of(new ValueType("1e", "string"), new ValueType("2e", "string")));
-
-        lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var2");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("3", "string"), new ValueType("4", "string")));
-        lunaticXmlCollectedData2.setPrevious(List.of(new ValueType("3p", "string"), new ValueType("4p", "string")));
-        collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2);
-        lunaticXmlData.setCollected(collected);
-
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit4.setId("interrogationId1");
-        lunaticXmlSurveyUnit4.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit4.setData(lunaticXmlData);
-
-        //SurveyUnit 5 : COLLECTED + EDITED + PREVIOUS + INPUTED
-        lunaticXmlData = new LunaticXmlData();
-
-        lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-        lunaticXmlCollectedData.setEdited(List.of(new ValueType("1e", "string"), new ValueType("2e", "string")));
-        lunaticXmlCollectedData.setInputed(List.of(new ValueType("1i", "string"), new ValueType("2i", "string")));
-
-        lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var2");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("3", "string"), new ValueType("4", "string")));
-        lunaticXmlCollectedData2.setPrevious(List.of(new ValueType("3p", "string"), new ValueType("4p", "string")));
-        collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2);
-        lunaticXmlData.setCollected(collected);
-
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit5.setId("interrogationId1");
-        lunaticXmlSurveyUnit5.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit5.setData(lunaticXmlData);
-
-        //SurveyUnit 6 : COLLECTED only, has one unknown variable
-        lunaticXmlData = new LunaticXmlData();
-
-        lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-
-        lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var3");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-
-
-        collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2);
-        lunaticXmlData.setCollected(collected);
-
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit6.setId("interrogationId1");
-        lunaticXmlSurveyUnit6.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit6.setData(lunaticXmlData);
-
-        //SurveyUnit 7 : COLLECTED only, has two unknown variables with known variable prefix or suffix
-        lunaticXmlData = new LunaticXmlData();
-
-        lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-
-        lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var1_MISSING");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("1", "string"), new ValueType("2", "string")));
-
-        LunaticXmlCollectedData lunaticXmlCollectedData3 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData3.setVariableName("FILTER_RESULT_var1");
-        lunaticXmlCollectedData3.setCollected(List.of(new ValueType("1", "string"), new ValueType("1", "string")));
-
-        collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2, lunaticXmlCollectedData3);
-        lunaticXmlData.setCollected(collected);
-
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit7.setId("interrogationId1");
-        lunaticXmlSurveyUnit7.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit7.setData(lunaticXmlData);
-
-        //SurveyUnit 8 : Only collected data
-        lunaticXmlData = new LunaticXmlData();
-        lunaticXmlCollectedData = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData.setVariableName("var1");
-        lunaticXmlCollectedData.setCollected(List.of(new ValueType(null,"null"),new ValueType("1", "string"), new ValueType("2", "string")));
-        lunaticXmlCollectedData2 = new LunaticXmlCollectedData();
-        lunaticXmlCollectedData2.setVariableName("var2");
-        lunaticXmlCollectedData2.setCollected(List.of(new ValueType("4", "string")));
-        collected = List.of(lunaticXmlCollectedData, lunaticXmlCollectedData2);
-        lunaticXmlData.setCollected(collected);
-        external = List.of();
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit8.setId("interrogationId1");
-        lunaticXmlSurveyUnit8.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit8.setData(lunaticXmlData);
-
-        //SurveyUnit 9 : External data only
-        lunaticXmlData = new LunaticXmlData();
-        collected = List.of();
-        lunaticXmlData.setCollected(collected);
-        LunaticXmlOtherData lunaticXmlOtherData = new LunaticXmlOtherData();
-        lunaticXmlOtherData.setVariableName("extvar1");
-        lunaticXmlOtherData.setValues(List.of(new ValueType("ext", "string")));
-        external = List.of(lunaticXmlOtherData);
-        lunaticXmlData.setExternal(external);
-        lunaticXmlSurveyUnit9.setId("interrogationId1");
-        lunaticXmlSurveyUnit9.setQuestionnaireModelId("questionnaireId1");
-        lunaticXmlSurveyUnit9.setData(lunaticXmlData);
-
-        //VariablesMap
-        Group group = new Group(LOOP_NAME, Constants.ROOT_GROUP_NAME);
-        Variable var1 = new Variable("var1", group, VariableType.STRING, "1");
-        Variable var2 = new Variable("var2", metadataModel.getRootGroup(), VariableType.STRING, "1");
-        Variable extvar1 = new Variable("extvar1", group, VariableType.STRING, "1");
-        metadataModel.getVariables().putVariable(var1);
-        metadataModel.getVariables().putVariable(var2);
-        metadataModel.getVariables().putVariable(extvar1);
-    }
+    private static final String CAMPAIGN_ID = "campaign-2024";
+    private static final String QUESTIONNAIRE_ID = "questionnaire-abc";
+    private static final String INTERROGATION_ID = "interrogation-123";
+    private static final Mode MODE = Mode.WEB;
+    private static final VariablesMap VARIABLES_MAP = new VariablesMap();
 
-    @Test
-    @DisplayName("SurveyUnitModel should not be null")
-    void test01() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit1, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels).isNotNull().isNotEmpty();
-    }
+    // -------------------------------------------------------------------------
+    // convert() — returned list composition
+    // -------------------------------------------------------------------------
 
-    @Test
-    @DisplayName("SurveyUnitModel should have the right questionnaireId")
-    void test02() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit1, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectionInstrumentId()).isEqualTo("questionnaireId1".toUpperCase());
-    }
+    @Nested
+    @DisplayName("convert() — list composition tests")
+    class ConvertListCompositionTests {
 
-    @Test
-    @DisplayName("SurveyUnitModel should have the right id")
-    void test03() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit1, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels.getFirst().getInterrogationId()).isEqualTo("interrogationId1");
-    }
+        @Test
+        @DisplayName("Should always include COLLECTED state in the result")
+        void convert_shouldAlwaysIncludeCollected() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
 
-    @Test
-    @DisplayName("SurveyUnitModel should contains 4 variable state updates")
-    void test04() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit1, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables()).hasSize(4);
-    }
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
 
-    @Test
-    @DisplayName("There should be a EDITED survey unit model with EDITED data")
-    void test05() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit2, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(2);
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.EDITED)
-        ).isNotEmpty();
-
-        Optional<SurveyUnitModel> editedSurveyUnitModel = surveyUnitModels.stream().filter(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.EDITED)
-        ).findFirst();
-        Assertions.assertThat(editedSurveyUnitModel).isPresent();
-
-        //Content check
-        for (VariableModel collectedVariable : editedSurveyUnitModel.get().getCollectedVariables()) {
-            Assertions.assertThat(collectedVariable.value()).containsAnyOf("1e","2e").isNotEqualTo("1").isNotEqualTo(
-                    "2");
+            // THEN
+            assertThat(result).extracting(SurveyUnitModel::getState)
+                    .contains(DataState.COLLECTED);
+        }
+
+        @Test
+        @DisplayName("Should return only COLLECTED when no other state has data")
+        void convert_noOtherStateData_shouldReturnOnlyCollected() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
+
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
+
+            // THEN
+            assertThat(result).hasSize(1);
+            assertThat(result.getFirst().getState()).isEqualTo(DataState.COLLECTED);
+        }
+
+        @Test
+        @DisplayName("Should include EDITED state when it has data")
+        void convert_withEditedData_shouldIncludeEdited() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("collected-val")));
+            data.setEdited(List.of(getValueType("edited-val")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
+
+            // THEN
+            assertThat(result).extracting(SurveyUnitModel::getState)
+                    .contains(DataState.COLLECTED, DataState.EDITED);
+        }
+
+        @Test
+        @DisplayName("Should include INPUTED state when it has data")
+        void convert_withInputedData_shouldIncludeInputed() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("val")));
+            data.setInputed(List.of(getValueType("inputed-val")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
+
+            // THEN
+            assertThat(result).extracting(SurveyUnitModel::getState)
+                    .contains(DataState.INPUTED);
+        }
+
+        @Test
+        @DisplayName("Should include FORCED state when it has data")
+        void convert_withForcedData_shouldIncludeForced() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("val")));
+            data.setForced(List.of(getValueType("forced-val")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
+
+            // THEN
+            assertThat(result).extracting(SurveyUnitModel::getState)
+                    .contains(DataState.FORCED);
+        }
+
+        @Test
+        @DisplayName("Should include PREVIOUS state when it has data")
+        void convert_withPreviousData_shouldIncludePrevious() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("val")));
+            data.setPrevious(List.of(getValueType("previous-val")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
+
+            // THEN
+            assertThat(result).extracting(SurveyUnitModel::getState)
+                    .contains(DataState.PREVIOUS);
+        }
+
+        @Test
+        @DisplayName("Should include all 5 states when all have data")
+        void convert_allStatesHaveData_shouldReturnFiveModels() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("c")));
+            data.setEdited(List.of(getValueType("e")));
+            data.setInputed(List.of(getValueType("i")));
+            data.setForced(List.of(getValueType("f")));
+            data.setPrevious(List.of(getValueType("p")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
+
+            // THEN
+            assertThat(result).hasSize(5);
+            assertThat(result).extracting(SurveyUnitModel::getState)
+                    .containsExactlyInAnyOrder(
+                            DataState.COLLECTED, DataState.EDITED,
+                            DataState.INPUTED, DataState.FORCED, DataState.PREVIOUS);
+        }
+
+        @Test
+        @DisplayName("Should not include EDITED when its values are all null")
+        void convert_editedAllNullValues_shouldNotIncludeEdited() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("val")));
+            data.setEdited(List.of(getValueType(null))); // null value — no data
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            List<SurveyUnitModel> result = LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE);
+
+            // THEN
+            assertThat(result).extracting(SurveyUnitModel::getState).isNotEmpty()
+                    .doesNotContain(DataState.EDITED);
         }
     }
 
-    @Test
-    @DisplayName("There should be both EDITED survey unit model and FORCED survey unit model if there is EDITED and FORCED data")
-    void test06() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit3, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(3);
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.EDITED)
-        ).isNotEmpty();
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.FORCED)
-        ).isNotEmpty();
+    // -------------------------------------------------------------------------
+    // convert() — field mapping
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("convert() — field mapping tests")
+    class ConvertFieldMappingTests {
+
+        @Test
+        @DisplayName("Should map questionnaireModelId to collectionInstrumentId in uppercase")
+        void convert_shouldMapQuestionnaireIdUppercased() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getCollectionInstrumentId()).isEqualTo(QUESTIONNAIRE_ID.toUpperCase());
+        }
+
+        @Test
+        @DisplayName("Should map interrogation id")
+        void convert_shouldMapInterrogationId() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getInterrogationId()).isEqualTo(INTERROGATION_ID);
+        }
+
+        @Test
+        @DisplayName("Should map campaignId")
+        void convert_shouldMapCampaignId() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getCampaignId()).isEqualTo(CAMPAIGN_ID);
+        }
+
+        @Test
+        @DisplayName("Should map mode")
+        void convert_shouldMapMode() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getMode()).isEqualTo(MODE);
+        }
+
+        @Test
+        @DisplayName("Should set a non-null recordDate close to now")
+        void convert_shouldSetRecordDateCloseToNow() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
+            LocalDateTime before = LocalDateTime.now();
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            LocalDateTime after = LocalDateTime.now();
+            assertThat(collected.getRecordDate())
+                    .isNotNull()
+                    .isAfterOrEqualTo(before)
+                    .isBeforeOrEqualTo(after);
+        }
+
+        @Test
+        @DisplayName("Should map fileDate from survey unit")
+        void convert_shouldMapFileDate() {
+            // GIVEN
+            LocalDateTime fileDate = LocalDateTime.of(2024, 1, 15, 10, 0);
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(collectedDataWithValue("VAR1", "val")));
+            su.setFileDate(fileDate);
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getFileDate()).isEqualTo(fileDate);
+        }
     }
 
-    @Test
-    @DisplayName("There should be a EDITED model and PREVIOUS model if there is EDITED and PREVIOUS data")
-    void test07() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit4, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(3);
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.EDITED)
-        ).isNotEmpty();
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.PREVIOUS)
-        ).isNotEmpty();
+    // -------------------------------------------------------------------------
+    // convert() — collected variables
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("convert() — collected variables tests")
+    class ConvertCollectedVariablesTests {
+
+        @Test
+        @DisplayName("Should populate collectedVariables from COLLECTED data")
+        void convert_shouldPopulateCollectedVariables() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(
+                    collectedDataWithValue("VAR1", "value1")
+            ));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getCollectedVariables()).hasSize(1);
+            assertThat(collected.getCollectedVariables().getFirst().varId()).isEqualTo("VAR1");
+            assertThat(collected.getCollectedVariables().getFirst().value()).isEqualTo("value1");
+        }
+
+        @Test
+        @DisplayName("Should set iteration starting at 1 for each value")
+        void convert_shouldSetIterationStartingAtOne() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("val1"), getValueType("val2")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getCollectedVariables()).hasSize(2);
+            assertThat(collected.getCollectedVariables().get(0).iteration()).isEqualTo(1);
+            assertThat(collected.getCollectedVariables().get(1).iteration()).isEqualTo(2);
+        }
+
+        @Test
+        @DisplayName("Should skip collected variables with null value")
+        void convert_shouldSkipNullValues() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(List.of(getValueType("val"), getValueType(null)));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getCollectedVariables()).hasSize(1);
+            assertThat(collected.getCollectedVariables().getFirst().value()).isEqualTo("val");
+        }
+
+        @Test
+        @DisplayName("Should produce empty collectedVariables when collected list is null for a variable")
+        void convert_nullCollectedList_shouldProduceEmptyVariables() {
+            // GIVEN
+            LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+            data.setVariableName("VAR1");
+            data.setCollected(null); // null list — skipped
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(data));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getCollectedVariables()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should handle multiple variables in the collected data")
+        void convert_multipleVariables_shouldMapAll() {
+            // GIVEN
+            LunaticXmlSurveyUnit su = buildSurveyUnit(List.of(
+                    collectedDataWithValue("VAR1", "v1"),
+                    collectedDataWithValue("VAR2", "v2")
+            ));
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getCollectedVariables()).hasSize(2);
+            assertThat(collected.getCollectedVariables())
+                    .extracting(VariableModel::varId)
+                    .containsExactlyInAnyOrder("VAR1", "VAR2");
+        }
     }
 
-    @Test
-    @DisplayName("There should be multiple survey unit models if there is different data states (all 4)")
-    void test08() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit5, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(4);
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.EDITED)
-        ).isNotEmpty();
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.PREVIOUS)
-        ).isNotEmpty();
-        Assertions.assertThat(surveyUnitModels).filteredOn(surveyUnitModel ->
-                surveyUnitModel.getState().equals(DataState.INPUTED)
-        ).isNotEmpty();
+    // -------------------------------------------------------------------------
+    // convert() — external variables
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("convert() — external variables tests")
+    class ConvertExternalVariablesTests {
+
+        @Test
+        @DisplayName("Should populate externalVariables on the COLLECTED model")
+        void convert_shouldPopulateExternalVariables() {
+            // GIVEN
+            LunaticXmlOtherData external = new LunaticXmlOtherData();
+            external.setVariableName("EXT1");
+            external.setValues(List.of(getValueType("ext-value")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(
+                    List.of(collectedDataWithValue("VAR1", "v")),
+                    List.of(external)
+            );
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getExternalVariables()).hasSize(1);
+            assertThat(collected.getExternalVariables().getFirst().varId()).isEqualTo("EXT1");
+            assertThat(collected.getExternalVariables().getFirst().value()).isEqualTo("ext-value");
+        }
+
+        @Test
+        @DisplayName("Should skip external variables with null value")
+        void convert_externalNullValue_shouldSkip() {
+            // GIVEN
+            LunaticXmlOtherData external = new LunaticXmlOtherData();
+            external.setVariableName("EXT1");
+            external.setValues(List.of(getValueType(null)));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(
+                    List.of(collectedDataWithValue("VAR1", "v")),
+                    List.of(external)
+            );
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getExternalVariables()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should skip external variable when values list is null")
+        void convert_externalNullValuesList_shouldSkip() {
+            // GIVEN
+            LunaticXmlOtherData external = new LunaticXmlOtherData();
+            external.setVariableName("EXT1");
+            external.setValues(null);
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(
+                    List.of(collectedDataWithValue("VAR1", "v")),
+                    List.of(external)
+            );
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getExternalVariables()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should set iteration starting at 1 for external variables")
+        void convert_externalVariables_shouldSetIteration() {
+            // GIVEN
+            LunaticXmlOtherData external = new LunaticXmlOtherData();
+            external.setVariableName("EXT1");
+            external.setValues(List.of(getValueType("v1"), getValueType("v2")));
+
+            LunaticXmlSurveyUnit su = buildSurveyUnit(
+                    List.of(collectedDataWithValue("VAR1", "v")),
+                    List.of(external)
+            );
+
+            // WHEN
+            SurveyUnitModel collected = getCollected(LunaticXmlAdapter.convert(su, VARIABLES_MAP, CAMPAIGN_ID, MODE));
+
+            // THEN
+            assertThat(collected.getExternalVariables()).hasSize(2);
+            assertThat(collected.getExternalVariables().get(0).iteration()).isEqualTo(1);
+            assertThat(collected.getExternalVariables().get(1).iteration()).isEqualTo(2);
+        }
     }
 
-    @Test
-    @DisplayName("If a variable not present in DDI then he is in the root group")
-    void test09() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit6, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(1);
-
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables()).filteredOn(collectedVariableModel ->
-                collectedVariableModel.varId().equals("var3")).isNotEmpty();
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.varId().equals("var3")).toList().getFirst().parentId()).isNull();
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.varId().equals("var3")).toList().getFirst().scope()).isEqualTo(Constants.ROOT_GROUP_NAME);
+    // -------------------------------------------------------------------------
+    // Helpers
+    // -------------------------------------------------------------------------
+
+    private LunaticXmlSurveyUnit buildSurveyUnit(List<LunaticXmlCollectedData> collectedData) {
+        return buildSurveyUnit(collectedData, List.of());
     }
 
-    @Test
-    @DisplayName("If a variable A not present in DDI and is the extension of a known variable B, then the variable A is in the same group")
-    void test10() {
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit7, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables()).filteredOn(collectedVariableModel ->
-                collectedVariableModel.varId().equals("var1_MISSING")).hasSize(2);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.varId().equals("var1_MISSING")).toList().getFirst().parentId()).isNotNull().isEqualTo(Constants.ROOT_GROUP_NAME);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.varId().equals("var1_MISSING")).toList().getFirst().scope()).isNotEqualTo(Constants.ROOT_GROUP_NAME).isEqualTo(LOOP_NAME);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.varId().equals("FILTER_RESULT_var1")).toList().getFirst().parentId()).isNotNull().isEqualTo(Constants.ROOT_GROUP_NAME);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.varId().equals("FILTER_RESULT_var1")).toList().getFirst().scope()).isNotEqualTo(Constants.ROOT_GROUP_NAME).isEqualTo(LOOP_NAME);
+    private LunaticXmlSurveyUnit buildSurveyUnit(
+            List<LunaticXmlCollectedData> collectedData,
+            List<LunaticXmlOtherData> externalData) {
+
+        LunaticXmlSurveyUnit su = new LunaticXmlSurveyUnit();
+        su.setId(INTERROGATION_ID);
+        su.setQuestionnaireModelId(QUESTIONNAIRE_ID);
+
+        fr.insee.genesis.controller.sources.xml.LunaticXmlData data =
+                new fr.insee.genesis.controller.sources.xml.LunaticXmlData();
+        data.setCollected(collectedData);
+        data.setExternal(externalData);
+        su.setData(data);
+
+        return su;
     }
 
-    @Test
-    @DisplayName("Value should be affected in the good loop iteration")
-    void test11(){
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit8, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables()).hasSize(3);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables()).filteredOn(collectedVariableModel ->
-                collectedVariableModel.varId().equals("var1")).isNotEmpty();
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables()).filteredOn(collectedVariableModel ->
-                collectedVariableModel.scope().equals("BOUCLE1")
-                && collectedVariableModel.iteration().equals(1)
-        ).isEmpty();
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.scope().equals("BOUCLE1")
-                && collectedVariableModel.iteration().equals(2)
-        ).toList().getFirst().value()).isEqualTo("1");
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables().stream().filter(collectedVariableModel ->
-                collectedVariableModel.scope().equals("BOUCLE1")
-                && collectedVariableModel.iteration().equals(3)
-        ).toList().getFirst().value()).isEqualTo("2");
+    private LunaticXmlCollectedData collectedDataWithValue(String varName, String value) {
+        LunaticXmlCollectedData data = new LunaticXmlCollectedData();
+        data.setVariableName(varName);
+        data.setCollected(List.of(getValueType(value)));
+        return data;
     }
 
-    @Test
-    @DisplayName("External value should be affected in the good loop iteration")
-    void test12(){
-        // When
-        List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit9, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
-        // Then
-        Assertions.assertThat(surveyUnitModels).hasSize(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getCollectedVariables()).isEmpty();
-        Assertions.assertThat(surveyUnitModels.getFirst().getExternalVariables()).hasSize(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getExternalVariables().getFirst().varId()).isEqualTo("extvar1");
-        Assertions.assertThat(surveyUnitModels.getFirst().getExternalVariables().getFirst().value()).isEqualTo("ext");
-        Assertions.assertThat(surveyUnitModels.getFirst().getExternalVariables().getFirst().scope()).isEqualTo(LOOP_NAME);
-        Assertions.assertThat(surveyUnitModels.getFirst().getExternalVariables().getFirst().iteration()).isEqualTo(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getExternalVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
+    private ValueType getValueType(String value) {
+        ValueType vt = new ValueType(
+                value,
+                "STRING"
+        );
+        vt.setValue(value);
+        return vt;
     }
 
-}
+    private SurveyUnitModel getCollected(List<SurveyUnitModel> models) {
+        return models.stream()
+                .filter(m -> m.getState() == DataState.COLLECTED)
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("No COLLECTED model found"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/CombinedRawDataControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/CombinedRawDataControllerTest.java
new file mode 100644
index 00000000..6224022b
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/controller/rest/CombinedRawDataControllerTest.java
@@ -0,0 +1,75 @@
+package fr.insee.genesis.controller.rest;
+
+import fr.insee.genesis.controller.dto.rawdata.CombinedRawDataDto;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
+import fr.insee.genesis.domain.service.rawdata.CombinedRawDataService;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class CombinedRawDataControllerTest {
+
+    @Mock
+    private CombinedRawDataService combinedRawDataService;
+
+    @InjectMocks
+    private CombinedRawDataController combinedRawDataController;
+
+    @Test
+    void getCombinedRawData_test() {
+        //GIVEN
+        String interrogationId = "test";
+
+        CombinedRawDataDto combinedRawDataDto = new CombinedRawDataDto(
+                List.of(
+                        RawResponseModel.builder().build()
+                ),
+                List.of(
+                        LunaticJsonRawDataModel.builder().build()
+                )
+        );
+        doReturn(combinedRawDataDto).when(combinedRawDataService).getCombinedRawDataByInterrogationId(any());
+
+        //WHEN
+        ResponseEntity<CombinedRawDataDto> response = combinedRawDataController.getCombinedRawData(interrogationId);
+
+        //THEN
+        verify(combinedRawDataService, times(1))
+                .getCombinedRawDataByInterrogationId(interrogationId);
+        Assertions.assertThat(response.getBody()).isEqualTo(combinedRawDataDto);
+    }
+
+    @Test
+    void getCombinedRawData_not_found_test() {
+        //GIVEN
+        String interrogationId = "test";
+
+        CombinedRawDataDto combinedRawDataDto = new CombinedRawDataDto(
+                new ArrayList<>(), new ArrayList<>()
+        );
+        doReturn(combinedRawDataDto).when(combinedRawDataService).getCombinedRawDataByInterrogationId(any());
+
+        //WHEN
+        ResponseEntity<CombinedRawDataDto> response = combinedRawDataController.getCombinedRawData(interrogationId);
+
+        //THEN
+        verify(combinedRawDataService, times(1))
+                .getCombinedRawDataByInterrogationId(interrogationId);
+        Assertions.assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/DataProcessingContextControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/DataProcessingContextControllerTest.java
index 4f08ec28..70fe7c3c 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/DataProcessingContextControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/DataProcessingContextControllerTest.java
@@ -1,951 +1,197 @@
 package fr.insee.genesis.controller.rest;
 
-import fr.insee.genesis.Constants;
 import fr.insee.genesis.TestConstants;
-import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
-import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
 import fr.insee.genesis.domain.model.context.schedule.ServiceToCall;
-import fr.insee.genesis.domain.service.context.DataProcessingContextService;
-import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
-import fr.insee.genesis.infrastructure.mappers.DataProcessingContextMapper;
+import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
+import lombok.SneakyThrows;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.time.LocalDateTime;
-import java.time.Month;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 class DataProcessingContextControllerTest {
-    //Given
-    private static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-    private static DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub;
-    private static DataProcessingContextController dataProcessingContextController;
+
+    @Mock
+    DataProcessingContextApiPort dataProcessingContextApiPort;
+
+    DataProcessingContextController dataProcessingContextController;
 
     @BeforeEach
-    void clean() throws IOException {
-        dataProcessingContextPersistancePortStub = new DataProcessingContextPersistancePortStub();
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
+    void setUp() {
         dataProcessingContextController = new DataProcessingContextController(
-                new DataProcessingContextService(dataProcessingContextPersistancePortStub, surveyUnitPersistencePortStub),
-                new FileUtils(new ConfigStub())
+                dataProcessingContextApiPort,
+                new FileUtils(TestConstants.getConfigStub())
         );
-        //Clean genesis_deleted_schedules log folder
-        if(Files.exists(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME))) {
-            try(Stream<Path> files = Files.list(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                    .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME))){
-                for (Path filePath : files.toList()) {
-                    Files.deleteIfExists(filePath);
-                }
-            }
-        }
     }
 
     @Test
-    void getAllSchedulesTest() {
-        //When
-        ResponseEntity<Object> response = dataProcessingContextController.getAllSchedules();
-
-        //Then
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-    }
-
-    @Test
-    void getAllSchedulesV2Test() {
-        //When
-        ResponseEntity<Object> response = dataProcessingContextController.getAllSchedulesV2();
-
-        //Then
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-    }
-
-    @Test
-    void addScheduleWithoutEncryptionTest() {
-        //When
-        String partitionId = "TESTADDSURVEY";
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-        dataProcessingContextController.saveSchedule(partitionId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "TEST", "TEST", false);
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)
-        ).isNotEmpty();
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters()).isNull();
-    }
-
-    @Test
-    void addScheduleWithoutEncryptionTestUsingCollectionInstrumentId() {
-        //When
-        String collectionInstrumentId = "TESTADDSURVEY_CI";
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-        dataProcessingContextController.saveScheduleWithCollectionInstrumentId(collectionInstrumentId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "TEST", "TEST", false);
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)
-        ).isNotEmpty();
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters()).isNull();
-    }
-
-    @Test
-    void addScheduleWithoutEncryptionTest_nullServiceToCall() {
-        //When
-        String partitionId = "TESTADDSURVEY";
-        ServiceToCall serviceToCall = null;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-        dataProcessingContextController.saveSchedule(partitionId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "TEST", "TEST", false);
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)
-        ).isNotEmpty();
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)).toList();
+    @SneakyThrows
+    void saveContextWithCollectionInstrumentId_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        boolean withReview = true;
 
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
+        //WHEN
+        dataProcessingContextController.saveContextWithCollectionInstrumentId(
+                collectionInstrumentId, withReview
+        );
 
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getServiceToCall()).isEqualTo(ServiceToCall.MAIN);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters()).isNull();
+        //THEN
+        verify(dataProcessingContextApiPort, times(1))
+                .saveContextByCollectionInstrumentId(collectionInstrumentId, withReview);
     }
 
     @Test
-    void addScheduleWithoutEncryptionTest_nullServiceToCall_collectionInstrumentId() {
-        //When
-        String collectionInstrumentId = "TESTADDSURVEY_CI";
-        ServiceToCall serviceToCall = null;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-        dataProcessingContextController.saveScheduleWithCollectionInstrumentId(collectionInstrumentId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "TEST", "TEST", false);
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)
-        ).isNotEmpty();
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)).toList();
+    @SneakyThrows
+    void saveContextWithCollectionInstrumentId_null_review_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
 
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
+        //WHEN
+        dataProcessingContextController.saveContextWithCollectionInstrumentId(
+                collectionInstrumentId, null
+        );
 
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getServiceToCall()).isEqualTo(ServiceToCall.MAIN);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters()).isNull();
+        //THEN
+        verify(dataProcessingContextApiPort, times(1))
+                .saveContextByCollectionInstrumentId(collectionInstrumentId, false);
     }
 
     @Test
-    void addScheduleWithEncryptionTest() {
-        //When
-        String partitionId = "TESTADDSURVEY";
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
+    @SneakyThrows
+    void getReviewIndicatorByCollectionInstrumentId_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        boolean withReview = true;
+        doReturn(withReview).when(dataProcessingContextApiPort).getReviewByCollectionInstrumentId(any());
 
-        dataProcessingContextController.saveSchedule(partitionId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate, true,
-                "testvault/testkey",
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY).resolve("OUT_ENCRYPTED").resolve(partitionId).toString(),
-                false
+        //WHEN
+        ResponseEntity<Object> response = dataProcessingContextController.getReviewIndicatorByCollectionInstrumentId(
+                collectionInstrumentId
         );
 
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)
-        ).isNotEmpty();
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters()).isNotNull();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().getInputPath()).contains(
-                "TESTADDSURVEY");
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().getOutputFolder()).contains(
-                "TESTADDSURVEY");
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().getVaultPath()).isEqualTo(
-                "testvault/testkey");
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().isUseSignature()).isFalse();
+        //THEN
+        Assertions.assertThat(response.getBody())
+                .isNotNull()
+                .isInstanceOf(Boolean.class)
+                .isEqualTo(withReview);
     }
 
     @Test
-    void addScheduleWithEncryptionTest_collectionInstrumentId() {
-        //When
-        String collectionInstrumentId = "TESTADDSURVEY_CI";
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
+    @SneakyThrows
+    void saveScheduleWithCollectionInstrumentId_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        ServiceToCall serviceToCall = ServiceToCall.GENESIS;
         String frequency = "0 0 6 * * *";
         LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
+        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMinutes(1);
+        boolean useEncryption = false;
 
 
-        dataProcessingContextController.saveScheduleWithCollectionInstrumentId(collectionInstrumentId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate, true,
-                "testvault/testkey",
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY).resolve("OUT_ENCRYPTED").resolve(collectionInstrumentId).toString(),
+        //WHEN
+        dataProcessingContextController.saveScheduleWithCollectionInstrumentId(
+                collectionInstrumentId,
+                serviceToCall,
+                frequency,
+                scheduleBeginDate,
+                scheduleEndDate,
+                useEncryption,
+                "",
+                "",
                 false
         );
 
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)
-        ).isNotEmpty();
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters()).isNotNull();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().getInputPath()).contains(
-                "TESTADDSURVEY");
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().getOutputFolder()).contains(
-                "TESTADDSURVEY");
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().getVaultPath()).isEqualTo(
-                "testvault/testkey");
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getTrustParameters().isUseSignature()).isFalse();
-    }
-
-    @Test
-    void addAdditionnalScheduleTest() {
-        //When
-        String partitionId = "TESTSURVEY"; //Already exists in stub
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-
-        dataProcessingContextController.saveSchedule(partitionId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "", "", false);
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)
-        ).isNotEmpty().hasSize(1);
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-        Assertions.assertThat(dataProcessingContextDocument.getLastExecution()).isNull();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-    }
-
-    @Test
-    void addAdditionnalScheduleTest_collectionInstrumentId() {
-        //When
-        String collectionInstrumentId = "TESTADDSURVEY_CI"; //Already exists in stub
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-
-        dataProcessingContextController.saveScheduleWithCollectionInstrumentId(collectionInstrumentId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "", "", false);
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)
-        ).isNotEmpty().hasSize(1);
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-        Assertions.assertThat(dataProcessingContextDocument.getLastExecution()).isNull();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-    }
-
-    @Test
-    void addScheduleDedupTest()  {
-        //Given
-        addNewDocumentToStub();
-
-        //When
-        String partitionId = "TESTSURVEY"; //Already exists in stub
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "0 0 6 * * *";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-
-        dataProcessingContextController.saveSchedule(partitionId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "", "", false);
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)
-        ).isNotEmpty().hasSize(1);
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals(partitionId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-        Assertions.assertThat(dataProcessingContextDocument.getLastExecution()).isNull();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
+        //THEN
+        verify(dataProcessingContextApiPort, times(1))
+                .saveKraftwerkExecutionScheduleByCollectionInstrumentId(
+                        collectionInstrumentId,
+                        serviceToCall,
+                        frequency,
+                        scheduleBeginDate,
+                        scheduleEndDate,
+                        null
+                );
     }
 
     @Test
-    void addScheduleDedupTest_collectionInstrumentId()  {
-        //Given
-        addNewDocumentToStubWithCollectionInstrumentId();
-
-        //When
-        String collectionInstrumentId = "TESTSURVEY_CI"; //Already exists in stub
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
+    @SneakyThrows
+    void saveScheduleWithCollectionInstrumentId_with_encryption_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        ServiceToCall serviceToCall = ServiceToCall.GENESIS;
         String frequency = "0 0 6 * * *";
         LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
-
-
-        dataProcessingContextController.saveScheduleWithCollectionInstrumentId(collectionInstrumentId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "", "", false);
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)
-        ).isNotEmpty().hasSize(1);
-
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals(collectionInstrumentId)).toList();
-
-        DataProcessingContextDocument dataProcessingContextDocument = mongoStubFiltered.getFirst();
-        Assertions.assertThat(dataProcessingContextDocument.getLastExecution()).isNull();
-
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList()).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextDocument.getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo(frequency);
-    }
-
-    @Test
-    void updateLastExecutionTest(){
-        //Given
-        addNewDocumentToStub();
-
-        //When
-        dataProcessingContextController.setSurveyLastExecution("TESTSURVEY", LocalDateTime.now());
-
-        //Then
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEY")).toList();
-        Assertions.assertThat(mongoStubFiltered.getFirst().getLastExecution()).isNotNull();
-    }
-
-    @Test
-    void updateLastExecutionTest_collectionInstrumentId(){
-        //Given
-        addNewDocumentToStubWithCollectionInstrumentId();
-
-        //When
-        dataProcessingContextController.setSurveyLastExecutionByCollectionInstrumentId("TESTSURVEY_CI", LocalDateTime.now());
-
-        //Then
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEY_CI")).toList();
-        Assertions.assertThat(mongoStubFiltered.getFirst().getLastExecution()).isNotNull();
-    }
-
-    @Test
-    void setLastExecutionTestToNull(){
-        //Given
-        addNewDocumentToStub();
-
-        //When
-        dataProcessingContextController.setSurveyLastExecution("TESTSURVEY", null);
-
-        //Then
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEY")).toList();
-        Assertions.assertThat(mongoStubFiltered.getFirst().getLastExecution()).isNull();
-    }
-
-    @Test
-    void setLastExecutionTestToNull_collectionInstrumentId(){
-        //Given
-        addNewDocumentToStubWithCollectionInstrumentId();
-
-        //When
-        dataProcessingContextController.setSurveyLastExecutionByCollectionInstrumentId("TESTSURVEY_CI", null);
-
-        //Then
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEY_CI")).toList();
-        Assertions.assertThat(mongoStubFiltered.getFirst().getLastExecution()).isNull();
-    }
-
-    @Test
-    void setLastExecutionTest(){
-        //Given
-        LocalDateTime date = LocalDateTime.now();
-        addNewDocumentToStub();
-
-        //When
-        dataProcessingContextController.setSurveyLastExecution("TESTSURVEY", date);
-
-        //Then
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEY")).toList();
-        Assertions.assertThat(mongoStubFiltered.getFirst().getLastExecution()).isEqualTo(date);
-    }
-
-    @Test
-    void setLastExecutionTest_collectionInstrumentId(){
-        //Given
-        LocalDateTime date = LocalDateTime.now();
-        addNewDocumentToStubWithCollectionInstrumentId();
-
-        //When
-        dataProcessingContextController.setSurveyLastExecutionByCollectionInstrumentId("TESTSURVEY_CI", date);
-
-        //Then
-        List<DataProcessingContextDocument> mongoStubFiltered = dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEY_CI")).toList();
-        Assertions.assertThat(mongoStubFiltered.getFirst().getLastExecution()).isEqualTo(date);
-    }
-
-    @Test
-    void wrongFrequencyTest(){
-        //When+Then
-        String partitionId = "TESTSURVEY"; //Already exists in stub
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "ERROR";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
+        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMinutes(1);
+        boolean useEncryption = true;
+        String encryptionVaultPath = "test1";
+        String encryptionOutputFolder = "test2";
 
-        ResponseEntity<Object> response = dataProcessingContextController.saveSchedule(partitionId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "", "", false);
-        Assertions.assertThat(response.getStatusCode().is4xxClientError()).isTrue();
-    }
-
-    @Test
-    void wrongFrequencyTest_collectionInstrumentId(){
-        //When+Then
-        String collectionInstrumentId = "TESTSURVEY_CI"; //Already exists in stub
-        ServiceToCall serviceToCall = ServiceToCall.MAIN;
-        String frequency = "ERROR";
-        LocalDateTime scheduleBeginDate = LocalDateTime.now();
-        LocalDateTime scheduleEndDate = LocalDateTime.now().plusMonths(1);
 
-        ResponseEntity<Object> response = dataProcessingContextController.saveScheduleWithCollectionInstrumentId(collectionInstrumentId, serviceToCall, frequency, scheduleBeginDate, scheduleEndDate,
-                false, "", "", false);
-        Assertions.assertThat(response.getStatusCode().is4xxClientError()).isTrue();
-    }
-
-    @Test
-    void notFoundTest(){
-        //When+Then
-        ResponseEntity<Object> response = dataProcessingContextController.setSurveyLastExecution("ERROR", LocalDateTime.now());
-        Assertions.assertThat(response.getStatusCode().is4xxClientError()).isTrue();
-    }
-
-    @Test
-    void notFoundTest_collectionInstrumentId(){
-        //When+Then
-        ResponseEntity<Object> response = dataProcessingContextController.setSurveyLastExecutionByCollectionInstrumentId("ERROR", LocalDateTime.now());
-        Assertions.assertThat(response.getStatusCode().is4xxClientError()).isTrue();
-    }
-
-    @Test
-    void deleteScheduleTest(){
-        //When
-        dataProcessingContextController.deleteSchedules("TESTSURVEY");
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEY")
-        ).isEmpty();
-    }
-
-    @Test
-    void deleteScheduleTest_collectionInstrumentId(){
-        //When
-        dataProcessingContextController.deleteSchedulesByCollectionInstrumentId("TESTSURVEY_CI");
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEY_CI")
-        ).isEmpty();
-    }
-
-    @Test
-    void deleteExpiredScheduleTest_execution() {
-        //Given
-        DataProcessingContextModel dataProcessingContextModel = new DataProcessingContextModel(
-                null,
-                "TESTSURVEYADDED",
-                null,
-                null,
-                new ArrayList<>(),
+        //WHEN
+        dataProcessingContextController.saveScheduleWithCollectionInstrumentId(
+                collectionInstrumentId,
+                serviceToCall,
+                frequency,
+                scheduleBeginDate,
+                scheduleEndDate,
+                useEncryption,
+                encryptionVaultPath,
+                encryptionOutputFolder,
                 false
         );
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2000, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2000, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(5023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-
-        //When
-        dataProcessingContextController.deleteExpiredSchedules();
-
-        //Then
-        //Expired schedule deleted
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEYADDED")
-        ).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEYADDED")).toList().getFirst().getKraftwerkExecutionScheduleList()
-        ).isNotEmpty().hasSize(1);
 
-        //Expired schedule to log json file
-        Assertions.assertThat(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME)
-                .resolve("TESTSURVEYADDED.json")
-                .toFile()).exists().content().isNotEmpty().contains("2000").doesNotContain("5023");
+        //THEN
+        verify(dataProcessingContextApiPort, times(1))
+                .saveKraftwerkExecutionScheduleByCollectionInstrumentId(
+                        eq(collectionInstrumentId),
+                        eq(serviceToCall),
+                        eq(frequency),
+                        eq(scheduleBeginDate),
+                        eq(scheduleEndDate),
+                        any()
+                );
     }
 
-    @Test
-    void deleteExpiredScheduleTest_execution_collectionInstrumentId() {
-        //Given
-        DataProcessingContextModel dataProcessingContextModel = new DataProcessingContextModel(
-                null,
-                null,
-                "TESTSURVEYADDED_CI",
-                null,
-                new ArrayList<>(),
-                false
-        );
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2000, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2000, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(5023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-
-        //When
-        dataProcessingContextController.deleteExpiredSchedules();
-
-        //Then
-        //Expired schedule deleted
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEYADDED_CI")
-        ).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEYADDED_CI")).toList().getFirst().getKraftwerkExecutionScheduleList()
-        ).isNotEmpty().hasSize(1);
-
-        //Expired schedule to log json file
-        Assertions.assertThat(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME)
-                .resolve("TESTSURVEYADDED_CI.json")
-                .toFile()).exists().content().isNotEmpty().contains("2000").doesNotContain("5023");
-    }
 
     @Test
-    void deleteExpiredScheduleTest_wholeSurvey() {
-        //Given
-        DataProcessingContextModel dataProcessingContextModel = new DataProcessingContextModel(
-                null,
-                "TESTSURVEYADDED",
-                "TESTSURVEYADDED",
-                null,
-                new ArrayList<>(),
-                false
-        );
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2001, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2001, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2002, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2002, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-
-        //When
-        dataProcessingContextController.deleteExpiredSchedules();
-
-        //Then
-        //Expired schedule deleted
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEYADDED")
-        ).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEYADDED")).toList().getFirst().getKraftwerkExecutionScheduleList()
-        ).isEmpty();
-
-
-        //Expired schedule to log json file
-        Assertions.assertThat(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME)
-                .resolve("TESTSURVEYADDED.json")
-                .toFile()).exists().content().isNotEmpty().contains("2001","2002");
-    }
+    void saveScheduleWithCollectionInstrumentId_wrong_cron_test() {
+        //GIVEN
+        String frequency = "dsadasd 0 6 * * *";
 
-    @Test
-    void deleteExpiredScheduleTest_wholeSurvey_collectionInstrumentId() {
-        //Given
-        DataProcessingContextModel dataProcessingContextModel = new DataProcessingContextModel(
-                null,
-                null,
-                "TESTSURVEYADDED_CI",
+        //WHEN
+        ResponseEntity<Object> response = dataProcessingContextController.saveScheduleWithCollectionInstrumentId(
                 null,
-                new ArrayList<>(),
-                false
-        );
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2001, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2001, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2002, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2002, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-
-        //When
-        dataProcessingContextController.deleteExpiredSchedules();
-
-        //Then
-        //Expired schedule deleted
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEYADDED_CI")
-        ).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEYADDED_CI")).toList().getFirst().getKraftwerkExecutionScheduleList()
-        ).isEmpty();
-
-
-        //Expired schedule to log json file
-        Assertions.assertThat(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME)
-                .resolve("TESTSURVEYADDED_CI.json")
-                .toFile()).exists().content().isNotEmpty().contains("2001","2002");
-    }
-
-    @Test
-    void deleteExpiredScheduleTest_appendLog() {
-        //Given
-        DataProcessingContextModel dataProcessingContextModel = new DataProcessingContextModel(
                 null,
-                "TESTSURVEYADDED2",
-                "TESTSURVEYADDED2",
+                frequency,
                 null,
-                new ArrayList<>(),
-                false
-        );
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2000, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2000, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(5023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-
-        //When
-        dataProcessingContextController.deleteExpiredSchedules();
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2001, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2001, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-        dataProcessingContextController.deleteExpiredSchedules();
-
-        //Then
-        //Expired schedules deleted
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TESTSURVEYADDED2")
-        ).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument
-                        .getPartitionId().equals("TESTSURVEYADDED2")).toList().getFirst().getKraftwerkExecutionScheduleList()
-        ).isNotEmpty().hasSize(1);
-
-        //Expired schedules to only one log json file
-        Assertions.assertThat(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME)
-                .resolve("TESTSURVEYADDED2.json")
-                .toFile()).exists().content().isNotEmpty().contains("2000","2001");
-    }
-
-    @Test
-    void deleteExpiredScheduleTest_appendLog_collectionInstrumentId() {
-        //Given
-        DataProcessingContextModel dataProcessingContextModel = new DataProcessingContextModel(
                 null,
+                false,
                 null,
-                "TESTSURVEYADDED2_CI",
                 null,
-                new ArrayList<>(),
                 false
         );
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2000, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2000, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(5023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-
-        //When
-        dataProcessingContextController.deleteExpiredSchedules();
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2001, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2001, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextModel.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(DataProcessingContextMapper.INSTANCE.modelToDocument(dataProcessingContextModel));
-        dataProcessingContextController.deleteExpiredSchedules();
-
-        //Then
-        //Expired schedules deleted
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getCollectionInstrumentId().equals("TESTSURVEYADDED2_CI")
-        ).isNotEmpty();
-        Assertions.assertThat(dataProcessingContextPersistancePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument
-                        .getCollectionInstrumentId().equals("TESTSURVEYADDED2_CI")).toList().getFirst().getKraftwerkExecutionScheduleList()
-        ).isNotEmpty().hasSize(1);
-
-        //Expired schedules to only one log json file
-        Assertions.assertThat(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                .resolve(Constants.SCHEDULE_ARCHIVE_FOLDER_NAME)
-                .resolve("TESTSURVEYADDED2_CI.json")
-                .toFile()).exists().content().isNotEmpty().contains("2000","2001");
-    }
-
-    @ParameterizedTest
-    @ValueSource(booleans = {false, true})
-    void getReview_test(boolean withReview){
-        //GIVEN
-        String partitionId = "TESTPARTITION";
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setPartitionId("TESTPARTITION");
-        doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc.setWithReview(withReview);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
-
-        //WHEN
-        ResponseEntity<Object> response = dataProcessingContextController.getReviewIndicator(partitionId);
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(200);
-        Assertions.assertThat(response.getBody().getClass()).isEqualTo(Boolean.class);
-        Assertions.assertThat((Boolean) response.getBody()).isEqualTo(withReview);
-    }
-
-    @ParameterizedTest
-    @ValueSource(booleans = {false, true})
-    void getReview_test_collectionInstrumentId(boolean withReview){
-        //GIVEN
-        String collectionInstrumentId = "TESTPARTITION_CI";
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setCollectionInstrumentId("TESTPARTITION_CI");
-        doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc.setWithReview(withReview);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
-
-        //WHEN
-        ResponseEntity<Object> response = dataProcessingContextController.getReviewIndicatorByCollectionInstrumentId(collectionInstrumentId);
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(200);
-        Assertions.assertThat(response.getBody().getClass()).isEqualTo(Boolean.class);
-        Assertions.assertThat((Boolean) response.getBody()).isEqualTo(withReview);
-    }
-
-    @Test
-    void getReview_no_context_test(){
-        //WHEN
-        ResponseEntity<Object> response = dataProcessingContextController.getReviewIndicator(
-                "TESTPARTITIONIDNOCONTEXT"
-        );
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(404);
-    }
-
-    @Test
-    void getReview_no_context_test_collectionInstrumentId(){
-        //WHEN
-        ResponseEntity<Object> response = dataProcessingContextController.getReviewIndicatorByCollectionInstrumentId(
-                "TESTPARTITIONIDNOCONTEXT_CI"
-        );
 
         //THEN
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(404);
-    }
-
-
-    //UTILITY
-    private void addNewDocumentToStub() {
-        DataProcessingContextDocument dataProcessingContextDocumentTest = new DataProcessingContextDocument();
-        dataProcessingContextDocumentTest.setPartitionId("TESTSURVEY");
-        dataProcessingContextDocumentTest.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        dataProcessingContextDocumentTest.setWithReview(false);
-
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextDocumentTest.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextDocumentTest.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(dataProcessingContextDocumentTest);
+        Assertions.assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
     }
 
-    private void addNewDocumentToStubWithCollectionInstrumentId() {
-        DataProcessingContextDocument dataProcessingContextDocumentTest = new DataProcessingContextDocument();
-        dataProcessingContextDocumentTest.setCollectionInstrumentId("TESTSURVEY_CI");
-        dataProcessingContextDocumentTest.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        dataProcessingContextDocumentTest.setWithReview(false);
-        KraftwerkExecutionSchedule kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.JANUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextDocumentTest.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        kraftwerkExecutionSchedule = new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.of(2023, Month.FEBRUARY, 1, 1, 1, 1),
-                LocalDateTime.of(2023, Month.DECEMBER, 1, 1, 1, 1),
-                null
-        );
-        dataProcessingContextDocumentTest.getKraftwerkExecutionScheduleList().add(kraftwerkExecutionSchedule);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(dataProcessingContextDocumentTest);
-    }
-}
+    //TODO remove schedule endpoints and tests when Bangles V1 is deployed
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/HealthCheckControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/HealthCheckControllerTest.java
index b5ebd30a..5a19d42f 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/HealthCheckControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/HealthCheckControllerTest.java
@@ -1,95 +1,173 @@
 package fr.insee.genesis.controller.rest;
 
-import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.model.surveyunit.VariableModel;
+import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.service.context.DataProcessingContextService;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.web.servlet.MockMvc;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import static org.hamcrest.Matchers.containsString;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@Slf4j
+@WebMvcTest(HealthCheckController.class)
+@TestPropertySource(properties = "fr.insee.genesis.version=1.2.3-test")
 class HealthCheckControllerTest {
-    static HealthCheckController healthCheckController;
-
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-
-    @BeforeAll
-    static void init() {
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-        SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
-                surveyUnitPersistencePortStub,
-                new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub()),
-                new FileUtils(new ConfigStub())
-        );
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(variable);
-        variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(variable);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-        collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .scope("TESTSCOPE")
-                .iteration(2)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-        surveyUnitPersistencePortStub.getMongoStub().add(SurveyUnitModel.builder()
-                .campaignId("TESTCAMPAIGNID")
-                .mode(Mode.WEB)
-                .interrogationId("TESTINTERROGATIONID")
-                .collectionInstrumentId("TESTQUESTIONNAIREID")
-                .state(DataState.COLLECTED)
-                .fileDate(LocalDateTime.of(2023, 1, 1, 0, 0 , 0))
-                .recordDate(LocalDateTime.of(2024, 1, 1, 0, 0, 0))
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build());
-
-        healthCheckController = new HealthCheckController(
-                surveyUnitApiPort,
-                new DataProcessingContextService(new DataProcessingContextPersistancePortStub(), new SurveyUnitPersistencePortStub())
-        );
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockitoBean
+    private SurveyUnitApiPort surveyUnitApiPort;
+
+    @MockitoBean
+    private DataProcessingContextApiPort dataProcessingContextApiPort;
+
+    // -------------------------------------------------------------------------
+    // GET /health-check
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("GET /health-check tests")
+    class HealthcheckTests {
+
+        @Test
+        @WithMockUser(username = "test-user")
+        @DisplayName("Should return 200 OK")
+        void healthcheck_shouldReturn200() throws Exception {
+            // GIVEN
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check"))
+                    .andExpect(status().isOk());
+        }
+
+        @Test
+        @WithMockUser(username = "test-user")
+        @DisplayName("Should include 'OK' in response body")
+        void healthcheck_shouldContainOk() throws Exception {
+            // GIVEN
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check"))
+                    .andExpect(content().string(containsString("OK")));
+        }
+
+        @Test
+        @WithMockUser(username = "test-user")
+        @DisplayName("Should include the project version in response body")
+        void healthcheck_shouldContainVersion() throws Exception {
+            // GIVEN
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check"))
+                    .andExpect(content().string(containsString("1.2.3-test")));
+        }
+
+        @Test
+        @WithMockUser(username = "test-user")
+        @DisplayName("Should include the authenticated username in response body")
+        void healthcheck_shouldContainUsername() throws Exception {
+            // GIVEN
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check"))
+                    .andExpect(content().string(containsString("test-user")));
+        }
     }
 
-    @Test
-    void mongoCountTest() {
-        ResponseEntity<String> response = healthCheckController.healthcheckMongo();
-        log.info(response.getBody());
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
+    // -------------------------------------------------------------------------
+    // GET /health-check/mongoDb
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("GET /health-check/mongoDb tests")
+    class HealthcheckMongoTests {
+
+        @Test
+        @WithMockUser
+        @DisplayName("Should return 200 OK")
+        void healthcheckMongo_shouldReturn200() throws Exception {
+            // GIVEN
+            when(surveyUnitApiPort.countResponses()).thenReturn(42L);
+            when(dataProcessingContextApiPort.countContexts()).thenReturn(7L);
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check/mongoDb"))
+                    .andExpect(status().isOk());
+        }
+
+        @Test
+        @WithMockUser
+        @DisplayName("Should include 'MongoDB OK' in response body")
+        void healthcheckMongo_shouldContainMongoDbOk() throws Exception {
+            // GIVEN
+            when(surveyUnitApiPort.countResponses()).thenReturn(0L);
+            when(dataProcessingContextApiPort.countContexts()).thenReturn(0L);
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check/mongoDb"))
+                    .andExpect(content().string(containsString("MongoDB OK")));
+        }
+
+        @Test
+        @WithMockUser
+        @DisplayName("Should include the response count from surveyUnitApiPort")
+        void healthcheckMongo_shouldContainResponseCount() throws Exception {
+            // GIVEN
+            when(surveyUnitApiPort.countResponses()).thenReturn(42L);
+            when(dataProcessingContextApiPort.countContexts()).thenReturn(0L);
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check/mongoDb"))
+                    .andExpect(content().string(containsString("42")));
+        }
+
+        @Test
+        @WithMockUser
+        @DisplayName("Should include the context count from dataProcessingContextApiPort")
+        void healthcheckMongo_shouldContainContextCount() throws Exception {
+            // GIVEN
+            when(surveyUnitApiPort.countResponses()).thenReturn(0L);
+            when(dataProcessingContextApiPort.countContexts()).thenReturn(7L);
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check/mongoDb"))
+                    .andExpect(content().string(containsString("7")));
+        }
+
+        @Test
+        @WithMockUser
+        @DisplayName("Should include 'Responses' label in response body")
+        void healthcheckMongo_shouldContainResponsesLabel() throws Exception {
+            // GIVEN
+            when(surveyUnitApiPort.countResponses()).thenReturn(0L);
+            when(dataProcessingContextApiPort.countContexts()).thenReturn(0L);
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check/mongoDb"))
+                    .andExpect(content().string(containsString("Responses")));
+        }
+
+        @Test
+        @WithMockUser
+        @DisplayName("Should include 'Contexts' label in response body")
+        void healthcheckMongo_shouldContainContextsLabel() throws Exception {
+            // GIVEN
+            when(surveyUnitApiPort.countResponses()).thenReturn(0L);
+            when(dataProcessingContextApiPort.countContexts()).thenReturn(0L);
+
+            // WHEN / THEN
+            mockMvc.perform(get("/health-check/mongoDb"))
+                    .andExpect(content().string(containsString("Contexts")));
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/JsonExtractionControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/JsonExtractionControllerTest.java
new file mode 100644
index 00000000..ab4a6226
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/controller/rest/JsonExtractionControllerTest.java
@@ -0,0 +1,96 @@
+package fr.insee.genesis.controller.rest;
+
+import fr.insee.genesis.controller.dto.LastExtractionResponseDto;
+import fr.insee.genesis.domain.model.extraction.json.LastJsonExtractionModel;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.ports.api.LastJsonExtractionApiPort;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.ResponseEntity;
+
+import java.time.LocalDateTime;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class JsonExtractionControllerTest {
+
+    @Mock
+    private LastJsonExtractionApiPort lastJsonExtractionApiPort;
+
+    @InjectMocks
+    private JsonExtractionController jsonExtractionController;
+
+    @Captor
+    private ArgumentCaptor<LastJsonExtractionModel> lastJsonExtractionModelArgumentCaptor;
+
+    @Test
+    void saveLastJsonExtractionDate_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+
+        //WHEN
+        jsonExtractionController.saveLastJsonExtractionDate(collectionInstrumentId, mode);
+
+        //THEN
+        verify(lastJsonExtractionApiPort, times(1))
+                .recordDate(lastJsonExtractionModelArgumentCaptor.capture());
+        LastJsonExtractionModel lastJsonExtractionModel = lastJsonExtractionModelArgumentCaptor.getValue();
+        Assertions.assertThat(lastJsonExtractionModel.getCollectionInstrumentId()).isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(lastJsonExtractionModel.getMode()).isEqualTo(mode);
+        Assertions.assertThat(lastJsonExtractionModel.getLastExtractionDate()).isNotNull();
+    }
+
+    @Test
+    @SneakyThrows
+    void getLastJsonExtractionDate_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+        LocalDateTime lastExtractionDate = LocalDateTime.now();
+
+        LastJsonExtractionModel lastJsonExtractionModel = LastJsonExtractionModel.builder()
+                .collectionInstrumentId(collectionInstrumentId)
+                .mode(mode)
+                .lastExtractionDate(lastExtractionDate)
+                .build();
+        doReturn(lastJsonExtractionModel).when(lastJsonExtractionApiPort).getLastExtractionDate(
+                any(), any()
+        );
+
+        //WHEN
+        ResponseEntity<LastExtractionResponseDto> response =
+                jsonExtractionController.getLastJsonExtractionDate(collectionInstrumentId, mode);
+
+        //THEN
+        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
+        Assertions.assertThat(response.getBody()).isNotNull();
+        Assertions.assertThat(response.getBody().getLastExtractionDate()).isEqualTo(lastExtractionDate.toString());
+    }
+
+    @Test
+    @SneakyThrows
+    void deleteJsonExtractionDate() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+
+        //WHEN
+        ResponseEntity<Object> response = jsonExtractionController.deleteJsonExtractionDate(collectionInstrumentId, mode);
+
+        //THEN
+        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
+        verify(lastJsonExtractionApiPort).delete(collectionInstrumentId, mode);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/LunaticModelControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/LunaticModelControllerTest.java
new file mode 100644
index 00000000..5ab28060
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/controller/rest/LunaticModelControllerTest.java
@@ -0,0 +1,71 @@
+package fr.insee.genesis.controller.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import fr.insee.genesis.domain.model.lunaticmodel.LunaticModelModel;
+import fr.insee.genesis.domain.ports.api.LunaticModelApiPort;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.ResponseEntity;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class LunaticModelControllerTest {
+
+    @Mock
+    private LunaticModelApiPort lunaticModelApiPort;
+    @InjectMocks
+    private LunaticModelController lunaticModelController;
+
+    @Test
+    void saveRawResponsesFromJsonBody() {
+        //GIVEN
+        String questionnaireId = "test";
+        Map<String, Object> dataJson = new HashMap<>();
+
+        //WHEN
+        lunaticModelController.saveRawResponsesFromJsonBody(questionnaireId, dataJson);
+
+        //THEN
+        verify(lunaticModelApiPort, times(1)).save(
+                questionnaireId.toUpperCase(),
+                dataJson
+        );
+    }
+
+    @Test
+    @SneakyThrows
+    void getLunaticModelFromQuestionnaireId() {
+        //GIVEN
+        String questionnaireId = "test";
+        ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
+        Map<String, Object> lunaticModel = new HashMap<>();
+        String expected = objectMapper.writeValueAsString(lunaticModel);
+        doReturn(LunaticModelModel.builder()
+                .collectionInstrumentId(questionnaireId)
+                .lunaticModel(lunaticModel)
+                .recordDate(LocalDateTime.now()).build()
+        ).when(lunaticModelApiPort).get(any());
+
+        //WHEN
+        ResponseEntity<String> response = lunaticModelController.getLunaticModelFromQuestionnaireId(questionnaireId);
+
+        //THEN
+        verify(lunaticModelApiPort, times(1)).get(
+                questionnaireId
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(expected);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/QuestionnaireMetadataControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/QuestionnaireMetadataControllerTest.java
index b1a18a77..134b1c97 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/QuestionnaireMetadataControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/QuestionnaireMetadataControllerTest.java
@@ -1,177 +1,80 @@
 package fr.insee.genesis.controller.rest;
 
 import fr.insee.bpm.metadata.model.MetadataModel;
-import fr.insee.bpm.metadata.model.Variable;
-import fr.insee.bpm.metadata.model.VariableType;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.infrastructure.document.metadata.QuestionnaireMetadataDocument;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
+import fr.insee.genesis.domain.ports.api.QuestionnaireMetadataApiPort;
+import lombok.SneakyThrows;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.ResponseEntity;
 
-class QuestionnaireMetadataControllerTest {
-    public static final String VARIABLE_NAME = "TESTVAR";
-    static QuestionnaireMetadataPersistencePortStub questionnaireMetadataPersistencePortStub
-            = new QuestionnaireMetadataPersistencePortStub();
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
+class QuestionnaireMetadataControllerTest {
 
-    static QuestionnaireMetadataController questionnaireMetadataController = new QuestionnaireMetadataController(
-            new QuestionnaireMetadataService(questionnaireMetadataPersistencePortStub)
-    );
+    @Mock
+    QuestionnaireMetadataApiPort questionnaireMetadataApiPort;
 
-    @BeforeEach
-    void clean(){
-        questionnaireMetadataPersistencePortStub.getMongoStub().clear();
-    }
+    @InjectMocks
+    QuestionnaireMetadataController questionnaireMetadataController;
 
     @Test
-    void getMetadataTest(){
+    @SneakyThrows
+    void getMetadata_test() {
         //GIVEN
-        String questionnaireId = "TESTQUEST";
+        String questionnaireId = "questionnaireId";
         Mode mode = Mode.WEB;
-        String variableName = VARIABLE_NAME;
-        questionnaireMetadataPersistencePortStub.getMongoStub().add(
-                new QuestionnaireMetadataDocument(
-                        questionnaireId,
-                        null,
-                        mode,
-                        getMetadataModel(variableName)
-                )
-        );
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub()).hasSize(1);
+        MetadataModel metadataModel = new MetadataModel();
+        doReturn(metadataModel).when(questionnaireMetadataApiPort).find(any(), any());
 
         //WHEN
         ResponseEntity<Object> response = questionnaireMetadataController.getMetadata(questionnaireId, mode);
 
         //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat((MetadataModel) response.getBody()).isNotNull();
-        Assertions.assertThat(((MetadataModel) response.getBody()).getVariables().hasVariable(variableName)
-        ).isTrue();
-        Assertions.assertThat(((MetadataModel) response.getBody()).getVariables().getVariable(variableName)
-                .getGroup()).isEqualTo(((MetadataModel) response.getBody()).getRootGroup());
-        Assertions.assertThat(((MetadataModel) response.getBody()).getVariables().getVariable(variableName)
-                .getType()).isEqualTo(VariableType.STRING);
+        verify(questionnaireMetadataApiPort, times(1)).find(
+                questionnaireId,
+                mode
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(metadataModel);
     }
 
     @Test
-    void getMetadataTest_not_found(){
+    void saveMetadata_test() {
         //GIVEN
-        String questionnaireId = "ERRORTESTQUEST";
+        String questionnaireId = "questionnaireId";
         Mode mode = Mode.WEB;
+        MetadataModel metadataModel = new MetadataModel();
 
         //WHEN
-        ResponseEntity<Object> response = questionnaireMetadataController.getMetadata(questionnaireId, mode);
+        questionnaireMetadataController.saveMetadata(questionnaireId, mode, metadataModel);
 
         //THEN
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(404);
-    }
-
-    @Test
-    void saveMetadataTest(){
-        //GIVEN
-        String questionnaireId = "TESTQUEST";
-        Mode mode = Mode.WEB;
-        String variableName = VARIABLE_NAME;
-        MetadataModel metadataModel = getMetadataModel(variableName);
-
-        //WHEN
-        ResponseEntity<Object> response = questionnaireMetadataController.saveMetadata(questionnaireId, mode, metadataModel);
-
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().collectionInstrumentId())
-                .isEqualTo(questionnaireId);
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().mode())
-                .isEqualTo(mode);
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().metadataModel().getVariables()
-                        .hasVariable(variableName)).isTrue();
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().metadataModel().getVariables()
-                .getVariable(variableName).getGroup()).isEqualTo(metadataModel.getRootGroup());
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().metadataModel().getVariables()
-                .getVariable(variableName).getType()).isEqualTo(VariableType.STRING);
-    }
-
-    @Test
-    void saveMetadataTest_overwrite(){
-        //GIVEN
-        String questionnaireId = "TESTQUEST";
-        Mode mode = Mode.WEB;
-        String variableName = VARIABLE_NAME;
-        MetadataModel metadataModel = getMetadataModel(variableName);
-        questionnaireMetadataPersistencePortStub.getMongoStub().add(
-                new QuestionnaireMetadataDocument(
-                        questionnaireId,
-                        null,
-                        mode,
-                        metadataModel
-                )
+        verify(questionnaireMetadataApiPort, times(1)).save(
+                questionnaireId, mode, metadataModel
         );
-        metadataModel = new MetadataModel();
-        variableName = "TESTVAR2";
-        metadataModel.getVariables().putVariable(
-                new Variable(
-                        variableName,
-                        metadataModel.getRootGroup(),
-                        VariableType.INTEGER
-                )
-        );
-
-        //WHEN
-        ResponseEntity<Object> response = questionnaireMetadataController.saveMetadata(questionnaireId, mode, metadataModel);
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().collectionInstrumentId())
-                .isEqualTo(questionnaireId);
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().mode())
-                .isEqualTo(mode);
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().metadataModel().getVariables()
-                .hasVariable(variableName)).isTrue();
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().metadataModel().getVariables()
-                .getVariable(variableName).getGroup()).isEqualTo(metadataModel.getRootGroup());
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub().getFirst().metadataModel().getVariables()
-                .getVariable(variableName).getType()).isEqualTo(VariableType.INTEGER);
     }
 
     @Test
-    void deleteMetadataTest(){
+    void deleteMetadata_test() {
         //GIVEN
-        String questionnaireId = "TESTQUEST";
+        String questionnaireId = "questionnaireId";
         Mode mode = Mode.WEB;
-        questionnaireMetadataPersistencePortStub.getMongoStub().add(
-                new QuestionnaireMetadataDocument(
-                        questionnaireId,
-                        null,
-                        mode,
-                        new MetadataModel()
-                )
-        );
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub()).hasSize(1);
 
         //WHEN
         questionnaireMetadataController.deleteMetadata(questionnaireId, mode);
 
         //THEN
-        Assertions.assertThat(questionnaireMetadataPersistencePortStub.getMongoStub()).isEmpty();
-    }
-
-    private static MetadataModel getMetadataModel(String variableName) {
-        MetadataModel metadataModel = new MetadataModel();
-        metadataModel.getVariables().putVariable(
-                new Variable(
-                        variableName,
-                        metadataModel.getRootGroup(),
-                        VariableType.STRING
-                )
+        verify(questionnaireMetadataApiPort, times(1)).remove(
+                questionnaireId,
+                mode
         );
-        return metadataModel;
     }
-
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/RundeckExecutionControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/RundeckExecutionControllerTest.java
index 35eca5c2..1b39597c 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/RundeckExecutionControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/RundeckExecutionControllerTest.java
@@ -1,56 +1,34 @@
 package fr.insee.genesis.controller.rest;
 
-import fr.insee.genesis.domain.model.rundeck.Job;
 import fr.insee.genesis.domain.model.rundeck.RundeckExecution;
-import fr.insee.genesis.stubs.RundeckExecutionApiPortStub;
-import org.junit.jupiter.api.BeforeAll;
+import fr.insee.genesis.domain.ports.api.RundeckExecutionApiPort;
 import org.junit.jupiter.api.Test;
-import org.springframework.http.ResponseEntity;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 class RundeckExecutionControllerTest {
 
-    private static RundeckExecutionController rundeckExecutionController;
-    private static RundeckExecutionApiPortStub rundeckExecutionApiPortStub;
+    @Mock
+    RundeckExecutionApiPort rundeckExecutionApiPort;
 
-    @BeforeAll
-    static void init(){
-        rundeckExecutionApiPortStub = new RundeckExecutionApiPortStub();
-        rundeckExecutionController = new RundeckExecutionController(rundeckExecutionApiPortStub);
-    }
+    @InjectMocks
+    RundeckExecutionController rundeckExecutionController;
 
     @Test
-    void testAddRundeckExecution_Success() {
-
+    void addRundeckExecution() {
+        //GIVEN
         RundeckExecution rundeckExecution = new RundeckExecution();
-        Job job = new Job();
-        job.setName("TEST");
-        rundeckExecution.setJob(job);
 
-        // WHEN
-        ResponseEntity<Object> response = rundeckExecutionController.addRundeckExecution(rundeckExecution);
+        //WHEN
+        rundeckExecutionController.addRundeckExecution(rundeckExecution);
 
-        // THEN
-        assertEquals(ResponseEntity.ok().build(), response);
+        //THEN
+        verify(rundeckExecutionApiPort, times(1)).addExecution(rundeckExecution);
     }
-
-    @Test
-    void testAddRundeckExecution_Failure() {
-        // GIVEN
-        rundeckExecutionApiPortStub.setShouldThrowException(true);
-
-        RundeckExecution rundeckExecution = new RundeckExecution();
-        Job job = new Job();
-        job.setName("TEST");
-
-        rundeckExecution.setJob(job);
-
-        // WHEN
-        ResponseEntity<Object> response = rundeckExecutionController.addRundeckExecution(rundeckExecution);
-
-        // THEN
-        assertEquals(ResponseEntity.internalServerError().build(), response);
-    }
-
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java
deleted file mode 100644
index 1e9fae6c..00000000
--- a/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java
+++ /dev/null
@@ -1,476 +0,0 @@
-package fr.insee.genesis.controller.rest;
-
-
-import fr.insee.genesis.Constants;
-import fr.insee.genesis.TestConstants;
-import fr.insee.genesis.controller.utils.ControllerUtils;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.model.surveyunit.VariableModel;
-import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
-import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.ports.spi.DataProcessingContextPersistancePort;
-import fr.insee.genesis.domain.service.context.DataProcessingContextService;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.rawdata.LunaticJsonRawDataService;
-import fr.insee.genesis.domain.service.rawdata.RawResponseService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.domain.service.volumetry.VolumetryLogService;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.LunaticJsonRawDataPersistanceStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.RawResponseDataPersistanceStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitQualityToolPerretAdapterStub;
-import lombok.SneakyThrows;
-import org.assertj.core.api.Assertions;
-import org.junit.Ignore;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.FileSystemUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-
-class UtilsControllerTest {
-    //Given
-    static UtilsController utilsControllerStatic;
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-    static LunaticJsonRawDataPersistanceStub lunaticJsonRawDataPersistencePort;
-    static RawResponseDataPersistanceStub rawResponseDataPersistanceStub;
-    static DataProcessingContextPersistancePort contextStub = new DataProcessingContextPersistancePortStub();
-    static SurveyUnitQualityToolPerretAdapterStub surveyUnitQualityToolPerretAdapterStub;
-    static List<InterrogationId> interrogationIdList;
-    static FileUtils fileUtils = new FileUtils(new ConfigStub());
-    static ControllerUtils controllerUtils = new ControllerUtils(fileUtils);
-    static QuestionnaireMetadataService metadataService = new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub());
-    static SurveyUnitService surveyUnitService = new SurveyUnitService(surveyUnitPersistencePortStub, metadataService, fileUtils);
-    static SurveyUnitQualityService surveyUnitQualityService = new SurveyUnitQualityService();
-
-    static Path logFileFolder = Path.of(new ConfigStub().getLogFolder()).resolve(Constants.VOLUMETRY_FOLDER_NAME);
-
-    @BeforeAll
-    static void init() {
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-        lunaticJsonRawDataPersistencePort = new LunaticJsonRawDataPersistanceStub();
-        rawResponseDataPersistanceStub = new RawResponseDataPersistanceStub();
-        SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(surveyUnitPersistencePortStub, metadataService, fileUtils);
-        LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = new LunaticJsonRawDataService(
-                        lunaticJsonRawDataPersistencePort,
-                        controllerUtils,
-                        metadataService,
-                        surveyUnitService,
-                        surveyUnitQualityService,
-                        fileUtils,
-                        new DataProcessingContextService(
-                                new DataProcessingContextPersistancePortStub(),
-                                surveyUnitPersistencePortStub),
-                        surveyUnitQualityToolPerretAdapterStub,
-                        new ConfigStub(),
-                        contextStub);
-
-        RawResponseService rawResponseApiPort = new RawResponseService(
-                controllerUtils,
-                metadataService,
-                surveyUnitService,
-                surveyUnitQualityService,
-                surveyUnitQualityToolPerretAdapterStub,
-                new DataProcessingContextService(
-                        new DataProcessingContextPersistancePortStub(),
-                        surveyUnitPersistencePortStub),
-                fileUtils,
-                new ConfigStub(),
-                rawResponseDataPersistanceStub
-        );
-
-
-        utilsControllerStatic = new UtilsController(
-                new VolumetryLogService(new ConfigStub())
-                , surveyUnitApiPort
-                , lunaticJsonRawDataApiPort
-                , rawResponseApiPort
-        );
-
-        interrogationIdList = new ArrayList<>();
-        interrogationIdList.add(new InterrogationId(DEFAULT_INTERROGATION_ID));
-    }
-
-    @BeforeEach
-    void reset() throws IOException {
-        //MongoDB stub management
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(variable);
-        variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(variable);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-        collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .scope("TESTSCOPE")
-                .iteration(2)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-
-        surveyUnitPersistencePortStub.getMongoStub().add(SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId("TEST-TABLEAUX")
-                .state(DataState.COLLECTED)
-                .fileDate(LocalDateTime.of(2023, 1, 1, 0, 0, 0))
-                .recordDate(LocalDateTime.of(2024, 1, 1, 0, 0, 0))
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build());
-
-        //Test file management
-        //Clean DONE folder
-        Path testResourcesPath = Path.of(TestConstants.TEST_RESOURCES_DIRECTORY);
-        if (testResourcesPath.resolve("DONE").toFile().exists())
-            Files.walk(testResourcesPath.resolve("DONE"))
-                    .sorted(Comparator.reverseOrder())
-                    .map(Path::toFile)
-                    .forEach(File::delete);
-
-        //Recreate data files
-        //SAMPLETEST-PARADATA-V1
-        //Root
-        if (!testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("data.complete.validated.STPDv1.20231122164209.xml")
-                .toFile().exists()
-        ){
-            Files.copy(
-                    testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("reponse-platine")
-                            .resolve("data.complete.partial.STPDv1.20231122164209.xml")
-                    , testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("data.complete.partial.STPDv1.20231122164209.xml")
-            );
-            Files.copy(
-                    testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("reponse-platine")
-                            .resolve("data.complete.validated.STPDv1.20231122164209.xml")
-                    , testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("data.complete.validated.STPDv1.20231122164209.xml")
-            );
-        }
-        //Differential data
-        if (!testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("differential")
-                .resolve("data")
-                .resolve("data.complete.validated.STPDv1.20231122164209.xml")
-                .toFile().exists()
-        ) {
-            Files.copy(
-                    testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("reponse-platine")
-                            .resolve("data.complete.partial.STPDv1.20231122164209.xml")
-                    , testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("differential")
-                            .resolve("data")
-                            .resolve("data.complete.partial.STPDv1.20231122164209.xml")
-            );
-            Files.copy(
-                    testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("reponse-platine")
-                            .resolve("data.complete.validated.STPDv1.20231122164209.xml")
-                    , testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V1")
-                            .resolve("differential")
-                            .resolve("data")
-                            .resolve("data.complete.validated.STPDv1.20231122164209.xml")
-            );
-        }
-        //SAMPLETEST-PARADATA-V2
-        if (!testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V2")
-                .resolve("data.complete.validated.STPDv2.20231122164209.xml")
-                .toFile().exists()
-        ){
-            Files.copy(
-                    testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V2")
-                            .resolve("reponse-platine")
-                            .resolve("data.complete.partial.STPDv2.20231122164209.xml")
-                    , testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V2")
-                            .resolve("data.complete.partial.STPDv2.20231122164209.xml")
-            );
-            Files.copy(
-                    testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V2")
-                            .resolve("reponse-platine")
-                            .resolve("data.complete.validated.STPDv2.20231122164209.xml")
-                    , testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-PARADATA-V2")
-                            .resolve("data.complete.validated.STPDv2.20231122164209.xml")
-            );
-        }
-        //SAMPLETEST-NO-COLLECTED
-        if (!testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-NO-COLLECTED")
-                .resolve("differential")
-                .resolve("data")
-                .resolve("data_diff_no_collected.xml")
-                .toFile().exists()
-        ){
-            Files.copy(
-                    testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-NO-COLLECTED")
-                            .resolve("data_diff_no_collected.xml")
-                    , testResourcesPath
-                            .resolve("IN")
-                            .resolve("WEB")
-                            .resolve("SAMPLETEST-NO-COLLECTED")
-                            .resolve("differential")
-                            .resolve("data")
-                            .resolve("data_diff_no_collected.xml")
-            );
-        }
-    }
-
-    @Test
-    void saveVolumetryTest() throws IOException {
-        //WHEN
-        ResponseEntity<Object> response = utilsControllerStatic.saveVolumetry();
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        try(Stream<Path> pathStream = Files.list(logFileFolder).filter(logFilePath ->
-                logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_FILE_SUFFIX)
-                        && !logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_RAW_FILE_SUFFIX)
-        )) {
-            List<Path> pathList = pathStream.toList();
-            Assertions.assertThat(pathList).hasSize(1);
-            Assertions.assertThat(pathList.getFirst())
-                    .exists().content().isNotEmpty()
-                    .contains("TEST-TABLEAUX;1");
-        }
-    }
-
-    @Test
-    @Ignore("Can fail randomly")
-    void saveVolumetryTest_overwrite() throws IOException {
-        //WHEN
-        utilsControllerStatic.saveVolumetry();
-        ResponseEntity<Object> response = utilsControllerStatic.saveVolumetry();
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        try(Stream<Path> pathStream = Files.list(logFileFolder).filter(logFilePath ->
-                logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_FILE_SUFFIX)
-                        && !logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_RAW_FILE_SUFFIX)
-        )) {
-            List<Path> pathList = pathStream.toList();
-            Assertions.assertThat(pathList).hasSize(1);
-            Assertions.assertThat(pathList.getFirst())
-                    .exists().content().isNotEmpty()
-                    .contains("TEST-TABLEAUX;1")
-                    .doesNotContain("TEST-TABLEAUX;1\nTEST-TABLEAUX;1");
-        }
-    }
-
-    @Test
-    void saveVolumetryTest_additionnal_campaign() throws IOException {
-        //Given
-        addAdditionalSurveyUnitModelToMongoStub("TEST-TABLEAUX2","TEST-TABLEAUX2");
-
-        //WHEN
-        ResponseEntity<Object> response = utilsControllerStatic.saveVolumetry();
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        try(Stream<Path> pathStream = Files.list(logFileFolder).filter(logFilePath ->
-                logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_FILE_SUFFIX)
-                && !logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_RAW_FILE_SUFFIX)
-        )){
-            List<Path> pathList = pathStream.toList();
-            Assertions.assertThat(pathList).hasSize(1);
-            Assertions.assertThat(pathList.getFirst())
-                    .isNotNull().exists().content().isNotEmpty().contains("TEST-TABLEAUX;1").contains("TEST-TABLEAUX2;1");
-        }
-    }
-    @Test
-    void saveVolumetryTest_additionnal_campaign_and_document() throws IOException {
-        //Given
-        addAdditionalSurveyUnitModelToMongoStub("TEST-TABLEAUX");
-        addAdditionalSurveyUnitModelToMongoStub("TEST-TABLEAUX2","TEST-TABLEAUX2");
-
-        //WHEN
-        ResponseEntity<Object> response = utilsControllerStatic.saveVolumetry();
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        try(Stream<Path> pathStream = Files.list(logFileFolder).filter(logFilePath ->
-                logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_FILE_SUFFIX)
-                        && !logFilePath.getFileName().toString().contains(Constants.VOLUMETRY_RAW_FILE_SUFFIX)
-        )){
-            List<Path> pathList = pathStream.toList();
-            Assertions.assertThat(pathList).hasSize(1);
-            Assertions.assertThat(pathList.getFirst())
-                    .isNotNull().exists().content().isNotEmpty().contains("TEST-TABLEAUX;2").contains("TEST-TABLEAUX2;1");
-        }
-    }
-
-    @Test
-    void cleanOldVolumetryLogFiles() throws IOException {
-        //GIVEN
-        Path oldLogFilePath = logFileFolder
-                .resolve(LocalDateTime.of(2000,1,1,0,0,0).format(DateTimeFormatter.ofPattern(Constants.VOLUMETRY_FILE_DATE_FORMAT))
-                        + Constants.VOLUMETRY_FILE_SUFFIX + ".csv");
-
-        Files.createDirectories(oldLogFilePath.getParent());
-        Files.write(oldLogFilePath, "test".getBytes());
-
-        //WHEN
-        ResponseEntity<Object> response = utilsControllerStatic.saveVolumetry();
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(oldLogFilePath).doesNotExist();
-    }
-
-
-
-
-    // Utilities
-
-    private void addAdditionalSurveyUnitModelToMongoStub(String collectionInstrumentId) {
-        addAdditionalSurveyUnitModelToMongoStub("TEST-TABLEAUX",collectionInstrumentId);
-    }
-
-    private void addAdditionalSurveyUnitModelToMongoStub(String campaignId, String collectionInstrumentId) {
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(variable);
-        variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(variable);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-        collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .scope("TESTSCOPE")
-                .iteration(2)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-
-        SurveyUnitModel recentSurveyUnitModel = SurveyUnitModel.builder()
-                .campaignId(campaignId)
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(collectionInstrumentId)
-                .state(DataState.COLLECTED)
-                .fileDate(LocalDateTime.of(2023, 2, 2, 0, 0, 0))
-                .recordDate(LocalDateTime.of(2024, 2, 2, 0, 0, 0))
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentSurveyUnitModel);
-    }
-
-    @AfterEach
-    @SneakyThrows
-    void tearDown() {
-        FileSystemUtils.deleteRecursively(logFileFolder);
-    }
-}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerUnitTest.java b/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerUnitTest.java
index fb152d44..78c29c2c 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerUnitTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerUnitTest.java
@@ -5,34 +5,29 @@
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.domain.service.volumetry.VolumetryLogService;
 import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 class UtilsControllerUnitTest {
 
-    static UtilsController utilsController;
-    static LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort;
-    static RawResponseApiPort rawResponseApiPort;
-    static SurveyUnitApiPort surveyUnitApiPort;
-    static VolumetryLogService volumetryLogService;
+    @Mock
+    private static LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort;
+    @Mock
+    private static RawResponseApiPort rawResponseApiPort;
+    @Mock
+    private static SurveyUnitApiPort surveyUnitApiPort;
+    @Mock
+    private static VolumetryLogService volumetryLogService;
 
-    @BeforeEach
-    void setUp() {
-        lunaticJsonRawDataApiPort = mock(LunaticJsonRawDataApiPort.class);
-        rawResponseApiPort = mock(RawResponseApiPort.class);
-        volumetryLogService = mock(VolumetryLogService.class);
-        surveyUnitApiPort = mock(SurveyUnitApiPort.class);
-        utilsController = new UtilsController(
-                volumetryLogService,
-                surveyUnitApiPort,
-                lunaticJsonRawDataApiPort,
-                rawResponseApiPort
-        );
-    }
+    @InjectMocks
+    private static UtilsController utilsController;
 
     @Test
     @SneakyThrows
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java
index 3ac5f158..f18f4907 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java
@@ -1,83 +1,30 @@
 package fr.insee.genesis.controller.rest.responses;
 
-import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.http.ResponseEntity;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 class CampaignControllerTest {
-    //Given
-    static CampaignController campaignControllerStatic;
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-
-    @BeforeAll
-    static void init() {
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-        SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
-                surveyUnitPersistencePortStub,
-                new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub()),
-                new FileUtils(new ConfigStub())
-        );
-
-        campaignControllerStatic = new CampaignController( surveyUnitApiPort );
-
-    }
-
-    @BeforeEach
-    void reset() throws IOException {
-       Utils.reset(surveyUnitPersistencePortStub);
-    }
-
 
-    //When + Then
+    @Mock
+    private SurveyUnitApiPort surveyUnitApiPort;
 
-    @Test
-    void getCampaignsTest() {
-        Utils.addAdditionalSurveyUnitModelToMongoStub("TESTCAMPAIGN2","TESTQUESTIONNAIRE2", surveyUnitPersistencePortStub);
-
-        ResponseEntity<Set<String>> response = campaignControllerStatic.getCampaigns();
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
-                "TEST-TABLEAUX","TESTCAMPAIGN2");
-    }
+    @InjectMocks
+    private CampaignController campaignController;
 
     @Test
-    void getCampaignsWithQuestionnairesTest() {
-        Utils.addAdditionalSurveyUnitModelToMongoStub("TESTQUESTIONNAIRE2", surveyUnitPersistencePortStub);
-        Utils.addAdditionalSurveyUnitModelToMongoStub("TESTCAMPAIGN2","TESTQUESTIONNAIRE2", surveyUnitPersistencePortStub);
+    void getCampaignsWithQuestionnaires_test() {
+        //WHEN
+        campaignController.getCampaignsWithQuestionnaires();
 
-        ResponseEntity<List<CampaignWithQuestionnaire>> response = campaignControllerStatic.getCampaignsWithQuestionnaires();
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
-        Assertions.assertThat(response.getBody().stream().filter(campaignWithQuestionnaire ->
-                        campaignWithQuestionnaire.getCampaignId().equals("TEST-TABLEAUX")
-                                || campaignWithQuestionnaire.getCampaignId().equals("TESTCAMPAIGN2")
-        )).isNotNull().isNotEmpty().hasSize(2);
-
-        Assertions.assertThat(response.getBody().stream().filter(
-                campaignWithQuestionnaire -> campaignWithQuestionnaire.getCampaignId().equals("TEST-TABLEAUX")
-        ).findFirst().get().getQuestionnaires()).containsOnly(DEFAULT_COLLECTION_INSTRUMENT_ID, "TESTQUESTIONNAIRE2");
-
-        Assertions.assertThat(response.getBody().stream().filter(
-                campaignWithQuestionnaire -> campaignWithQuestionnaire.getCampaignId().equals("TESTCAMPAIGN2")
-        ).findFirst().get().getQuestionnaires()).containsOnly("TESTQUESTIONNAIRE2");
+        //THEN
+        verify(surveyUnitApiPort, times(1)).findCampaignsWithQuestionnaires();
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/ContextualVariableControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/ContextualVariableControllerTest.java
deleted file mode 100644
index 22bf2f9e..00000000
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/ContextualVariableControllerTest.java
+++ /dev/null
@@ -1,1170 +0,0 @@
-package fr.insee.genesis.controller.rest.responses;
-
-import fr.insee.genesis.Constants;
-import fr.insee.genesis.TestConstants;
-import fr.insee.genesis.controller.dto.VariableQualityToolDto;
-import fr.insee.genesis.controller.dto.VariableStateDto;
-import fr.insee.genesis.domain.model.contextualvariable.ContextualVariableModel;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.service.contextualvariable.ContextualVariableJsonService;
-import fr.insee.genesis.domain.service.contextualvariable.external.ContextualExternalVariableJsonService;
-import fr.insee.genesis.domain.service.contextualvariable.previous.ContextualPreviousVariableJsonService;
-import fr.insee.genesis.infrastructure.document.contextualexternal.ContextualExternalVariableDocument;
-import fr.insee.genesis.infrastructure.document.contextualprevious.ContextualPreviousVariableDocument;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.ContextualExternalVariablePersistancePortStub;
-import fr.insee.genesis.stubs.ContextualPreviousVariablePersistancePortStub;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.FileSystemUtils;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-
-@Slf4j
-class ContextualVariableControllerTest {
-
-    private static final String QUESTIONNAIRE_ID = "TEST-CONTEXTUAL";
-    private static final String INTERROGATION_ID_1 = "TEST1";
-    private static final String INTERROGATION_ID_2 = "TEST2";
-
-    private static final String QUESTIONNAIRE_ID_PREVIOUS = "TEST-CONTEXTUAL-PREVIOUS";
-    private static final String QUESTIONNAIRE_ID_EXTERNAL = "TEST-CONTEXTUAL-EXTERNAL";
-    private static final Path SOURCE_PATH_PREVIOUS =
-            Path.of(TestConstants.TEST_RESOURCES_DIRECTORY,"IN", Mode.WEB.getFolder()).resolve(QUESTIONNAIRE_ID_PREVIOUS);
-    private static final Path SOURCE_PATH_EXTERNAL =
-            Path.of(TestConstants.TEST_RESOURCES_DIRECTORY,"IN", Mode.WEB.getFolder()).resolve(QUESTIONNAIRE_ID_EXTERNAL);
-
-    private static final ContextualPreviousVariablePersistancePortStub previousStub =
-            new ContextualPreviousVariablePersistancePortStub();
-    private static final ContextualExternalVariablePersistancePortStub externalStub =
-            new ContextualExternalVariablePersistancePortStub();
-
-    private final ContextualVariableController contextualVariableController = new ContextualVariableController(
-            new ContextualPreviousVariableJsonService(previousStub),
-            new ContextualExternalVariableJsonService(externalStub),
-            new ContextualVariableJsonService(
-                    new ContextualPreviousVariableJsonService(previousStub),
-                    new ContextualExternalVariableJsonService(externalStub)
-            ),
-            new ConfigStub()
-    );
-
-    @BeforeEach
-    void clean() throws IOException {
-        FileSystemUtils.deleteRecursively(SOURCE_PATH_PREVIOUS);
-        FileSystemUtils.deleteRecursively(SOURCE_PATH_EXTERNAL);
-        FileSystemUtils.deleteRecursively(Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "DONE"));
-
-        previousStub.getMongoStub().clear();
-        externalStub.getMongoStub().clear();
-
-        previousStub.getMongoStub().put(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME, new ArrayList<>());
-        externalStub.getMongoStub().put(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME, new ArrayList<>());
-    }
-
-    //OK CASES
-    //GET
-    @Test
-    void getContextualVariables_test() {
-        //GIVEN
-        previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME).addAll(
-                getContextualPreviousTestDocuments()
-        );
-        externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME).addAll(
-                getContextualExternalTestDocuments()
-        );
-
-        //WHEN
-        ResponseEntity<Object> response = contextualVariableController.getContextualVariables(QUESTIONNAIRE_ID, INTERROGATION_ID_1);
-
-        //THEN
-        if(!response.getStatusCode().is2xxSuccessful()){
-            log.error((String)response.getBody());
-        }
-        Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
-        Assertions.assertInstanceOf(ContextualVariableModel.class,response.getBody());
-
-        ContextualPreviousVariableDocument contextualPreviousVariableDocument = previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME).stream().filter(
-                contextualPreviousVariableDocument1 ->
-                        contextualPreviousVariableDocument1.getQuestionnaireId().equals(QUESTIONNAIRE_ID)
-                                && contextualPreviousVariableDocument1.getInterrogationId().equals(INTERROGATION_ID_1)
-        ).toList().getFirst();
-        ContextualExternalVariableDocument contextualExternalVariableDocument =
-                externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME).stream().filter(
-                        contextualExternalVariableDocument1 ->
-                                contextualExternalVariableDocument1.getQuestionnaireId().equals(QUESTIONNAIRE_ID)
-                                        && contextualExternalVariableDocument1.getInterrogationId().equals(INTERROGATION_ID_1)
-                ).toList().getFirst();
-        ContextualVariableModel contextualVariableModel = (ContextualVariableModel) response.getBody();
-        Assertions.assertNotNull(contextualVariableModel);
-        Assertions.assertEquals(INTERROGATION_ID_1,contextualVariableModel.interrogationId());
-        assertDocumentEqualToDto(contextualPreviousVariableDocument, contextualVariableModel);
-        assertDocumentEqualToDto(contextualExternalVariableDocument, contextualVariableModel);
-    }
-
-    @Test
-    void getContextualVariables_test_no_external() {
-        //GIVEN
-        previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME).addAll(
-                getContextualPreviousTestDocuments()
-        );
-        externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME).addAll(
-                getContextualExternalTestDocuments()
-        );
-
-        //WHEN
-        ResponseEntity<Object> response = contextualVariableController.getContextualVariables(QUESTIONNAIRE_ID, INTERROGATION_ID_2);
-
-        //THEN
-        if(!response.getStatusCode().is2xxSuccessful()){
-            log.error((String)response.getBody());
-        }
-        Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
-        Assertions.assertInstanceOf(ContextualVariableModel.class,response.getBody());
-
-        ContextualPreviousVariableDocument contextualPreviousVariableDocument = previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME).stream().filter(
-                contextualPreviousVariableDocument1 ->
-                        contextualPreviousVariableDocument1.getQuestionnaireId().equals(QUESTIONNAIRE_ID)
-                                && contextualPreviousVariableDocument1.getInterrogationId().equals(INTERROGATION_ID_2)
-        ).toList().getFirst();
-
-        ContextualVariableModel contextualVariableModel = (ContextualVariableModel) response.getBody();
-        Assertions.assertEquals(INTERROGATION_ID_2,contextualVariableModel.interrogationId());
-        assertDocumentEqualToDto(contextualPreviousVariableDocument, contextualVariableModel);
-        Assertions.assertNotNull(contextualVariableModel.contextualExternal());
-        Assertions.assertTrue(contextualVariableModel.contextualExternal().isEmpty());
-    }
-
-    @Test
-    void getContextualVariables_test_not_found(){
-        //GIVEN
-        //Empty stubs from clean()
-
-        //WHEN
-        ResponseEntity<Object> response = contextualVariableController.getContextualVariables(QUESTIONNAIRE_ID,
-                INTERROGATION_ID_1);
-
-        //THEN
-        Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
-        Assertions.assertInstanceOf(ContextualVariableModel.class,response.getBody());
-        ContextualVariableModel contextualVariableModel = (ContextualVariableModel) response.getBody();
-        Assertions.assertEquals(INTERROGATION_ID_1,contextualVariableModel.interrogationId());
-        Assertions.assertNotNull(contextualVariableModel.contextualPrevious());
-        Assertions.assertTrue(contextualVariableModel.contextualPrevious().isEmpty());
-        Assertions.assertNotNull(contextualVariableModel.contextualExternal());
-        Assertions.assertTrue(contextualVariableModel.contextualExternal().isEmpty());
-    }
-
-    //POST ALL FILES OF QUESTIONNAIRE
-    @SneakyThrows
-    @ParameterizedTest(name = "[{index}] saveContextualVariables - previous {0}")
-    @MethodSource("casesPrevious")
-    void saveContextualVariables_previous_test(
-            String interrogationId,
-            int expectedCollectionSize,
-            int expectedVarCount,
-            Consumer<ContextualPreviousVariableDocument> assertionsForDoc
-    ) {
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_PREVIOUS.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_previous")
-                        .resolve("ok.json"),
-                contextualPath.resolve("ok.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN
-        ResponseEntity<Object> response = contextualVariableController.saveContextualVariables(QUESTIONNAIRE_ID_PREVIOUS);
-
-        //THEN
-        Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
-        List<ContextualPreviousVariableDocument> previousVarDocumentList = previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME);
-        Assertions.assertEquals(expectedCollectionSize,previousVarDocumentList.size());
-
-        List<ContextualPreviousVariableDocument> filter =
-                previousVarDocumentList
-                        .stream()
-                        .filter(doc -> doc.getInterrogationId().equals(interrogationId)).toList();
-        Assertions.assertEquals(1,filter.size());
-
-        ContextualPreviousVariableDocument firstDocument = filter.getFirst();
-        Assertions.assertNull(firstDocument.getSourceState());
-        Assertions.assertEquals(QUESTIONNAIRE_ID_PREVIOUS,firstDocument.getCollectionInstrumentId());
-
-        Assertions.assertEquals(expectedVarCount,firstDocument.getVariables().size());
-
-        // Assertions spécifiques au cas
-        assertionsForDoc.accept(firstDocument);
-    }
-    static Stream<Arguments> casesPrevious() {
-        return Stream.of(
-                Arguments.of(
-                        "AUTO104",
-                        /* expectedCollectionSize */ 2,
-                        /* expectedVarCount */ 15,
-                        (Consumer<ContextualPreviousVariableDocument>) doc -> {
-                            assertVariable(doc, "TEXTECOURT", "");
-                            assertVariable(doc, "TEXTELONG",
-                                    "test d'une donnée antérieure sur un texte long pour voir comment ça marche");
-                            assertVariable(doc, "FLOAT", 50.25d);
-                            assertVariableNull(doc, "INTEGER");
-                            assertVariable(doc, "BOOLEEN", true);
-                            assertVariable(doc, "DROPDOWN", "03");
-                            assertVariable(doc, "QCM_B1", true);
-                            assertVariable(doc, "QCM_B2", false);
-                            assertVariable(doc, "QCM_B4", true);
-                            assertVariable(doc, "TABLEAU2A11", 200);
-                            assertVariable(doc, "TABLEAU2A12", 150);
-                            assertVariable(doc, "TABLEAU2A23", 1000);
-                            assertVariableNull(doc, "TABLEAU2A24");
-                            assertVariable(doc, "TABOFATS1", 0, "AA");
-                            assertVariable(doc, "TABOFATS1", 1, "");
-                            assertVariable(doc, "TABOFATS1", 2, "BB");
-                            assertVariable(doc, "TABOFATS1", 3, "CC");
-                            assertVariable(doc, "TABOFATS3", 0, 5);
-                            assertVariableNull(doc, "TABOFATS3", 1);
-                            assertVariable(doc, "TABOFATS3", 2, 3);
-                        }
-                ),
-                Arguments.of(
-                        "AUTO108",
-                        /* expectedCollectionSize */ 2,
-                        /* expectedVarCount */ 14,
-                        (Consumer<ContextualPreviousVariableDocument>) doc -> {
-                            assertVariable(doc, "TEXTECOURT", "test previous");
-                            assertVariable(doc, "TEXTELONG", "");
-                            assertVariable(doc, "FLOAT", 12.2d);
-                            assertVariable(doc, "BOOLEEN", false);
-                            assertVariable(doc, "DROPDOWN", "");
-                            assertVariable(doc, "QCM_B1", false);
-                            assertVariable(doc, "QCM_B2", false);
-                            assertVariable(doc, "QCM_B5", true);
-                            assertVariable(doc, "TABLEAU2A11", 1);
-                            assertVariable(doc, "TABLEAU2A12", 2);
-                            assertVariable(doc, "TABLEAU2A23", 3);
-                            assertVariable(doc, "TABLEAU2A24", 4);
-                            assertVariable(doc, "TABOFATS1", 0, "BB");
-                            assertVariable(doc, "TABOFATS1", 1, "BB");
-                            assertVariable(doc, "TABOFATS3", 0, 10);
-                            assertVariable(doc, "TABOFATS3", 1, 4);
-                            assertVariable(doc, "TABOFATS3", 2, 0);
-                        }
-                )
-        );
-    }
-
-    @SneakyThrows
-    @ParameterizedTest(name = "[{index}] saveContextualVariables_external - cas {0}")
-    @MethodSource("casesExternal")
-    void saveContextualVariables_external_test( String interrogationId,
-                                                int expectedCollectionSize,
-                                                int expectedVarCount,
-                                                Consumer<ContextualExternalVariableDocument> assertionsForDoc) {
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_EXTERNAL.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_external")
-                        .resolve("ok.json"),
-                contextualPath.resolve("ok.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN
-        ResponseEntity<Object> response = contextualVariableController.saveContextualVariables(QUESTIONNAIRE_ID_EXTERNAL);
-
-        //THEN
-        Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
-        Assertions.assertEquals(expectedCollectionSize,externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME).size());
-
-        List<ContextualExternalVariableDocument> filter = externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME)
-                .stream().filter(doc -> doc.getInterrogationId().equals(interrogationId)).toList();
-        Assertions.assertEquals(1,filter.size());
-
-        ContextualExternalVariableDocument firstDoc = filter.getFirst();
-        Assertions.assertEquals(QUESTIONNAIRE_ID_EXTERNAL, firstDoc.getCollectionInstrumentId());
-        Assertions.assertEquals(expectedVarCount, firstDoc.getVariables().size());
-        assertionsForDoc.accept(firstDoc);
-
-    }
-
-    static Stream<Arguments> casesExternal() {
-        return Stream.of(
-                Arguments.of(
-                        "AUTO204",
-                        /* expectedCollectionSize */ 2,
-                        /* expectedVarCount */ 12,
-                        (Consumer<ContextualExternalVariableDocument>) doc -> {
-                            assertVariable(doc, "TVA", 302.34d);
-                            assertVariable(doc, "CA", 22.45d);
-                            assertVariable(doc, "COM_AUTRE", "blablablabla");
-                            assertVariable(doc, "INTERRO_N_1", true);
-                            assertVariable(doc, "INTERRO_N_2", false);
-                            assertVariable(doc, "NAF25", "9560Y");
-                            assertVariable(doc, "POIDS", 1.25);
-                            assertVariable(doc, "MILLESIME", "2024");
-                            assertVariable(doc, "NSUBST", true);
-
-                            assertVariable(doc, "TAB_EXTNUM", 0, 50);
-                            assertVariable(doc, "TAB_EXTNUM", 1, 23);
-                            assertVariable(doc, "TAB_EXTNUM", 2, 10);
-                            assertVariableNull(doc, "TAB_EXTNUM", 3);
-
-                            assertVariable(doc, "TAB_EXTCAR", 0, "A");
-                            assertVariable(doc, "TAB_EXTCAR", 1, "");
-                            assertVariable(doc, "TAB_EXTCAR", 2, "B");
-                        }
-                ),
-                Arguments.of(
-                        "AUTO208",
-                        /* expectedCollectionSize */ 2,
-                        /* expectedVarCount */ 11,
-                        (Consumer<ContextualExternalVariableDocument>) doc -> {
-                            assertVariable(doc, "TVA", "");
-                            assertVariable(doc, "COM_AUTRE", "");
-                            assertVariable(doc, "SECTEUR", "123456789");
-                            assertVariable(doc, "INTERRO_N_1", false);
-                            assertVariable(doc, "INTERRO_N_2", false);
-                            assertVariable(doc, "NAF25", "1014Z");
-                            assertVariable(doc, "POIDS", 12);
-                            assertVariable(doc, "MILLESIME", "2024");
-                            assertVariable(doc, "NSUBST", false);
-
-                            assertVariable(doc, "TAB_EXTNUM", 0, 10);
-                            assertVariable(doc, "TAB_EXTCAR", 0, "C");
-                            assertVariable(doc, "TAB_EXTCAR", 1, "C");
-                        }
-                )
-        );
-    }
-
-
-    @Test
-    @SneakyThrows
-    void saveContextualVariables_random_json_test() {
-        //GIVEN
-        Files.createDirectories(SOURCE_PATH_EXTERNAL);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY).resolve("contextual_external").resolve("random_json.json"),
-                SOURCE_PATH_EXTERNAL.resolve("random_json.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN
-        ResponseEntity<Object> response = contextualVariableController.saveContextualVariables(QUESTIONNAIRE_ID_EXTERNAL);
-
-        //THEN
-        Assertions.assertTrue(response.getStatusCode().is2xxSuccessful());
-        Assertions.assertTrue(
-                externalStub.getMongoStub()
-                        .get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME)
-                        .isEmpty(),
-                "MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME should be empty"
-        );    }
-
-    //PREVIOUS
-    @Test
-    @SneakyThrows
-    void readPreviousJson_no_source(){
-        testOKCase(null);
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"collecté", "edité"})
-    @SneakyThrows
-    void readPreviousJson_sourceState(String sourceState){
-        testOKCase(sourceState);
-    }
-
-    private void testOKCase(String sourceState) throws IOException {
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_PREVIOUS.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_previous")
-                        .resolve("ok.json"),
-                contextualPath.resolve("ok.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN
-        contextualVariableController.readContextualPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, sourceState, "ok.json");
-
-        //THEN
-        Assertions.assertEquals(2,previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME).size());
-
-        List<ContextualPreviousVariableDocument> filter = previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME)
-                .stream().filter(doc -> doc.getInterrogationId().equals("AUTO104")).toList();
-        Assertions.assertEquals(1,filter.size());
-        if(sourceState == null){
-            Assertions.assertNull(filter.getFirst().getSourceState());
-        }else{
-            Assertions.assertNotNull(filter.getFirst().getSourceState());
-            Assertions.assertEquals(sourceState, filter.getFirst().getSourceState());
-        }
-        Assertions.assertEquals(QUESTIONNAIRE_ID_PREVIOUS,filter.getFirst().getCollectionInstrumentId());
-
-        Assertions.assertEquals(15,filter.getFirst().getVariables().size());
-        assertVariable(filter.getFirst(), "TEXTECOURT", "");
-        assertVariable(filter.getFirst(), "TEXTELONG", "test d'une donnée antérieure sur un texte long pour voir comment ça marche");
-        assertVariable(filter.getFirst(), "FLOAT", 50.25d);
-        assertVariableNull(filter.getFirst(), "INTEGER");
-        assertVariable(filter.getFirst(), "BOOLEEN", true);
-        assertVariable(filter.getFirst(), "DROPDOWN", "03");
-        assertVariable(filter.getFirst(), "QCM_B1", true);
-        assertVariable(filter.getFirst(), "QCM_B2", false);
-        assertVariable(filter.getFirst(), "QCM_B4", true);
-        assertVariable(filter.getFirst(), "TABLEAU2A11", 200);
-        assertVariable(filter.getFirst(), "TABLEAU2A12", 150);
-        assertVariable(filter.getFirst(), "TABLEAU2A23", 1000);
-        assertVariableNull(filter.getFirst(), "TABLEAU2A24");
-        assertVariable(filter.getFirst(), "TABOFATS1",0, "AA");
-        assertVariable(filter.getFirst(), "TABOFATS1",1, "");
-        assertVariable(filter.getFirst(), "TABOFATS1",2, "BB");
-        assertVariable(filter.getFirst(), "TABOFATS1",3, "CC");
-        assertVariable(filter.getFirst(), "TABOFATS3",0, 5);
-        assertVariableNull(filter.getFirst(), "TABOFATS3",1);
-        assertVariable(filter.getFirst(), "TABOFATS3",2, 3);
-
-        filter = previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME)
-                .stream().filter(doc -> doc.getInterrogationId().equals("AUTO108")).toList();
-        Assertions.assertEquals(1,filter.size());
-        if(sourceState == null){
-            Assertions.assertNull(filter.getFirst().getSourceState());
-        }else{
-            Assertions.assertNotNull(filter.getFirst().getSourceState());
-            Assertions.assertEquals(sourceState, filter.getFirst().getSourceState());
-        }
-        Assertions.assertEquals(QUESTIONNAIRE_ID_PREVIOUS,filter.getFirst().getCollectionInstrumentId());
-
-        Assertions.assertEquals(14,filter.getFirst().getVariables().size());
-        assertVariable(filter.getFirst(), "TEXTECOURT", "test previous");
-        assertVariable(filter.getFirst(), "TEXTELONG", "");
-        assertVariable(filter.getFirst(), "FLOAT", 12.2d);
-        assertVariable(filter.getFirst(), "BOOLEEN", false);
-        assertVariable(filter.getFirst(), "DROPDOWN", "");
-        assertVariable(filter.getFirst(), "QCM_B1", false);
-        assertVariable(filter.getFirst(), "QCM_B2", false);
-        assertVariable(filter.getFirst(), "QCM_B5", true);
-        assertVariable(filter.getFirst(), "TABLEAU2A11", 1);
-        assertVariable(filter.getFirst(), "TABLEAU2A12", 2);
-        assertVariable(filter.getFirst(), "TABLEAU2A23", 3);
-        assertVariable(filter.getFirst(), "TABLEAU2A24",4);
-        assertVariable(filter.getFirst(), "TABOFATS1",0, "BB");
-        assertVariable(filter.getFirst(), "TABOFATS1",1, "BB");
-        assertVariable(filter.getFirst(), "TABOFATS3",0, 10);
-        assertVariable(filter.getFirst(), "TABOFATS3",1, 4);
-        assertVariable(filter.getFirst(), "TABOFATS3",2, 0);
-    }
-
-    @ParameterizedTest(name = "[{index}] readPreviousJson_override_interrogation_id — {0}")
-    @MethodSource("overridePreviousCases")
-    @SneakyThrows
-    void readPreviousJson_override_interrogation_id( String interrogationId,
-                                                     int expectedVarCount,
-                                                     Consumer<ContextualPreviousVariableDocument> assertionsForDoc){
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_PREVIOUS.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Path path = Path.of(TestConstants.TEST_RESOURCES_DIRECTORY);
-        Files.copy(
-               path.resolve("contextual_previous")
-                        .resolve("ok.json"),
-                contextualPath.resolve("ok.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-        contextualVariableController.readContextualPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, null, "ok.json");
-        Files.createDirectories(SOURCE_PATH_PREVIOUS);
-
-        Files.copy(
-               path.resolve("contextual_previous")
-                        .resolve("ok2.json"),
-                contextualPath.resolve("ok2.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN
-        contextualVariableController.readContextualPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, null, "ok2.json");
-
-        //THEN
-        Assertions.assertEquals(2,previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME).size());
-
-        List<ContextualPreviousVariableDocument> filter =
-                previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME)
-                .stream().filter(doc -> doc.getInterrogationId().equals(interrogationId)).toList();
-        Assertions.assertEquals(1, filter.size());
-        ContextualPreviousVariableDocument firstDoc = filter.getFirst();
-        Assertions.assertEquals(QUESTIONNAIRE_ID_PREVIOUS, firstDoc.getCollectionInstrumentId());
-
-        Assertions.assertAll(interrogationId + " metadata",
-                () -> Assertions.assertEquals(QUESTIONNAIRE_ID_PREVIOUS, firstDoc.getCollectionInstrumentId()),
-                () -> Assertions.assertEquals(expectedVarCount, firstDoc.getVariables().size())
-        );
-
-        assertionsForDoc.accept(firstDoc);
-        Assertions.assertTrue(
-                previousStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_PREVIOUS_COLLECTION_NAME).stream()
-                        .noneMatch(d -> "AUTO108".equals(d.getCollectionInstrumentId())),
-                "AUTO108 ne devrait plus être présent après override"
-        );
-    }
-
-
-    static Stream<Arguments> overridePreviousCases() {
-        return Stream.of(
-                Arguments.of(
-                        "AUTO104",
-                        /* expectedVarCount */ 15,
-                        (Consumer<ContextualPreviousVariableDocument>) doc -> {
-                            assertVariable(doc, "TEXTECOURT", "");
-                            assertVariable(doc, "TEXTELONG", "test d'une donnée antérieure sur un texte long pour voir comment ça marche");
-                            assertVariable(doc, "FLOAT", 50.25d);
-                            assertVariableNull(doc, "INTEGER");
-                            assertVariable(doc, "BOOLEEN", true);
-                            assertVariable(doc, "DROPDOWN", "03");
-                            assertVariable(doc, "QCM_B1", true);
-                            assertVariable(doc, "QCM_B2", false);
-                            assertVariable(doc, "QCM_B4", true);
-                            assertVariable(doc, "TABLEAU2A11", 200);
-                            assertVariable(doc, "TABLEAU2A12", 150);
-                            assertVariable(doc, "TABLEAU2A23", 1000);
-                            assertVariableNull(doc, "TABLEAU2A24");
-                            assertVariable(doc, "TABOFATS1", 0, "AA");
-                            assertVariable(doc, "TABOFATS1", 1, "");
-                            assertVariable(doc, "TABOFATS1", 2, "BB");
-                            assertVariable(doc, "TABOFATS1", 3, "CC");
-                            assertVariable(doc, "TABOFATS3", 0, 5);
-                            assertVariableNull(doc, "TABOFATS3", 1);
-                            assertVariable(doc, "TABOFATS3", 2, 3);
-                        }
-                ),
-                Arguments.of(
-                        "AUTO200",
-                        /* expectedVarCount */ 14,
-                        (Consumer<ContextualPreviousVariableDocument>) doc -> {
-                            assertVariable(doc, "TEXTECOURT", "test previous");
-                            assertVariable(doc, "TEXTELONG", "");
-                            assertVariable(doc, "FLOAT", 12.2d);
-                            assertVariable(doc, "BOOLEEN", false);
-                            assertVariable(doc, "DROPDOWN", "");
-                            assertVariable(doc, "QCM_B1", false);
-                            assertVariable(doc, "QCM_B2", false);
-                            assertVariable(doc, "QCM_B5", true);
-                            assertVariable(doc, "TABLEAU2A11", 1);
-                            assertVariable(doc, "TABLEAU2A12", 2);
-                            assertVariable(doc, "TABLEAU2A23", 3);
-                            assertVariable(doc, "TABLEAU2A24", 4);
-                            assertVariable(doc, "TABOFATS1", 0, "BB");
-                            assertVariable(doc, "TABOFATS1", 1, "BB");
-                            assertVariable(doc, "TABOFATS3", 0, 10);
-                            assertVariable(doc, "TABOFATS3", 1, 4);
-                            assertVariable(doc, "TABOFATS3", 2, 0);
-                        }
-                )
-        );
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"ceci est une origine beaucoup trop longue"})
-    @SneakyThrows
-    void readPreviousJson_sourceState_too_long(String sourceState){
-        //GIVEN
-        String fileName = "ok.json";
-        Path contextualPath = SOURCE_PATH_PREVIOUS.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_previous")
-                        .resolve(fileName),
-                contextualPath.resolve(fileName),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN + THEN
-        ResponseEntity<Object> response = contextualVariableController.readContextualPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, sourceState,
-                fileName);
-        Assertions.assertEquals(400,response.getStatusCode().value());
-    }
-
-    @Test
-    @SneakyThrows
-    void readPreviousJson_invalid_syntax(){
-        String syntaxErrorFileName = "invalid_syntax.json";
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_PREVIOUS.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_previous")
-                        .resolve(syntaxErrorFileName),
-                contextualPath.resolve(syntaxErrorFileName),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN + THEN
-        ResponseEntity<Object> response = contextualVariableController.readContextualPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, null,
-                syntaxErrorFileName);
-        Assertions.assertEquals(400,response.getStatusCode().value());
-    }
-    @Test
-    @SneakyThrows
-    void readPreviousJson_not_a_json(){
-        String syntaxErrorFileName = "not_a_json.xml";
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_PREVIOUS.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_previous")
-                        .resolve(syntaxErrorFileName),
-                contextualPath.resolve(syntaxErrorFileName),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN + THEN
-        ResponseEntity<Object> response = contextualVariableController.readContextualPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, null,
-                syntaxErrorFileName);
-        Assertions.assertEquals(400,response.getStatusCode().value());
-    }
-
-
-    @SneakyThrows
-    @ParameterizedTest
-    @ValueSource(strings = {"no_interrogationId.json", "only_one_interrogationId.json", "double_interrogationId.json"})
-    @DisplayName("Previous json return 400 if no interrogationId, only one interrogationId, or double interrogationId")
-    void readPreviousJson_no_interrogation_id(String fileName){
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_PREVIOUS.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_previous")
-                        .resolve(fileName),
-                contextualPath.resolve(fileName),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN + THEN
-        ResponseEntity<Object> response = contextualVariableController.readContextualPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, null, fileName);
-        Assertions.assertEquals(400,response.getStatusCode().value());
-    }
-
-
-    //EXTERNAL
-    @ParameterizedTest(name = "[{index}] readExternalJson — {0}")
-    @MethodSource("readExternalCases")    @SneakyThrows
-    void readExternalJson_test( String interrogationId,
-                                int expectedVarCount,
-                                Consumer<ContextualExternalVariableDocument> assertionsForDoc){
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_EXTERNAL.resolve("contextual");
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_external")
-                        .resolve("ok.json"),
-                contextualPath.resolve("ok.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN
-        contextualVariableController.readContextualExternalJson(QUESTIONNAIRE_ID_EXTERNAL, Mode.WEB, "ok.json");
-
-        //THEN
-        Assertions.assertEquals(2,externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME).size());
-
-        List<ContextualExternalVariableDocument> filter = externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME)
-                .stream().filter(doc -> doc.getInterrogationId().equals(interrogationId)).toList();
-        Assertions.assertEquals(1,filter.size());
-
-        ContextualExternalVariableDocument firstDoc = filter.getFirst();
-        Assertions.assertEquals(QUESTIONNAIRE_ID_EXTERNAL, firstDoc.getCollectionInstrumentId());
-        Assertions.assertEquals(expectedVarCount, firstDoc.getVariables().size());
-        assertionsForDoc.accept(firstDoc);
-    }
-
-
-    static Stream<Arguments> readExternalCases() {
-        return Stream.of(
-                Arguments.of(
-                        "AUTO204",
-                        /* expectedVarCount */ 12,
-                        (Consumer<ContextualExternalVariableDocument>) doc -> {
-                            assertVariable(doc, "TVA", 302.34d);
-                            assertVariable(doc, "CA", 22.45d);
-                            assertVariable(doc, "COM_AUTRE", "blablablabla");
-                            assertVariable(doc, "INTERRO_N_1", true);
-                            assertVariable(doc, "INTERRO_N_2", false);
-                            assertVariable(doc, "NAF25", "9560Y");
-                            assertVariable(doc, "POIDS", 1.25);
-                            assertVariable(doc, "MILLESIME", "2024");
-                            assertVariable(doc, "NSUBST", true);
-
-                            assertVariable(doc, "TAB_EXTNUM", 0, 50);
-                            assertVariable(doc, "TAB_EXTNUM", 1, 23);
-                            assertVariable(doc, "TAB_EXTNUM", 2, 10);
-                            assertVariableNull(doc, "TAB_EXTNUM", 3);
-
-                            assertVariable(doc, "TAB_EXTCAR", 0, "A");
-                            assertVariable(doc, "TAB_EXTCAR", 1, "");
-                            assertVariable(doc, "TAB_EXTCAR", 2, "B");
-                        }
-                ),
-                Arguments.of(
-                        "AUTO208",
-                        /* expectedVarCount */ 11,
-                        (Consumer<ContextualExternalVariableDocument>) doc -> {
-                            assertVariable(doc, "TVA", "");
-                            assertVariable(doc, "COM_AUTRE", "");
-                            assertVariable(doc, "SECTEUR", "123456789");
-                            assertVariable(doc, "INTERRO_N_1", false);
-                            assertVariable(doc, "INTERRO_N_2", false);
-                            assertVariable(doc, "NAF25", "1014Z");
-                            assertVariable(doc, "POIDS", 12);
-                            assertVariable(doc, "MILLESIME", "2024");
-                            assertVariable(doc, "NSUBST", false);
-
-                            assertVariable(doc, "TAB_EXTNUM", 0, 10);
-                            assertVariable(doc, "TAB_EXTCAR", 0, "C");
-                            assertVariable(doc, "TAB_EXTCAR", 1, "C");
-                        }
-                )
-        );
-    }
-
-    @ParameterizedTest(name = "[{index}] readExternalJson_override_interrogation_id — {0}")
-    @MethodSource("overrideExternalCases")
-    @SneakyThrows
-    void readExternalJson_override_interrogation_id(    String interrogationId,
-                                                        int expectedVarCount,
-                                                       Consumer<ContextualExternalVariableDocument> assertionsForDoc
-    ){
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_EXTERNAL.resolve("contextual");
-        Path path = Path.of(TestConstants.TEST_RESOURCES_DIRECTORY);
-        Files.createDirectories(contextualPath);
-        Files.copy(
-                path.resolve("contextual_external")
-                        .resolve("ok.json"),
-                contextualPath.resolve("ok.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-        contextualVariableController.readContextualExternalJson(QUESTIONNAIRE_ID_EXTERNAL, Mode.WEB, "ok.json");
-        Files.createDirectories(SOURCE_PATH_EXTERNAL);
-        Files.copy(
-                path.resolve("contextual_external")
-                        .resolve("ok2.json"),
-                contextualPath.resolve("ok2.json"),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN
-        contextualVariableController.readContextualExternalJson(QUESTIONNAIRE_ID_EXTERNAL, Mode.WEB, "ok2.json");
-
-        //THEN
-        Assertions.assertEquals(2,externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME).size());
-
-        List<ContextualExternalVariableDocument> filter =
-                externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME)
-                .stream().filter(doc -> doc.getInterrogationId().equals(interrogationId)).toList();
-        Assertions.assertEquals(1,filter.size());
-        Assertions.assertEquals(QUESTIONNAIRE_ID_EXTERNAL,filter.getFirst().getCollectionInstrumentId());
-        Assertions.assertEquals(expectedVarCount,filter.getFirst().getVariables().size());
-
-        assertionsForDoc.accept(filter.getFirst());
-
-        // L'ancien AUTO208 ne doit plus être présent
-        Assertions.assertTrue(
-                externalStub.getMongoStub().get(Constants.MONGODB_CONTEXTUAL_EXTERNAL_COLLECTION_NAME)
-                        .stream().noneMatch(d -> "AUTO208".equals(d.getCollectionInstrumentId())),
-                "AUTO208 ne devrait plus être présent après override"
-        );
-    }
-
-
-    static Stream<Arguments> overrideExternalCases() {
-        return Stream.of(
-                Arguments.of(
-                        "AUTO204",
-                        /* expectedVarCount */ 12,
-                        (Consumer<ContextualExternalVariableDocument>) doc -> {
-                            assertVariable(doc, "TVA", 302.34d);
-                            assertVariable(doc, "CA", 22.45d);
-                            assertVariable(doc, "COM_AUTRE", "blablablabla");
-                            assertVariable(doc, "INTERRO_N_1", true);
-                            assertVariable(doc, "INTERRO_N_2", false);
-                            assertVariable(doc, "NAF25", "9560Y");
-                            assertVariable(doc, "POIDS", 1.25);
-                            assertVariable(doc, "MILLESIME", "2024");
-                            assertVariable(doc, "NSUBST", true);
-
-                            assertVariable(doc, "TAB_EXTNUM", 0, 50);
-                            assertVariable(doc, "TAB_EXTNUM", 1, 23);
-                            assertVariable(doc, "TAB_EXTNUM", 2, 10);
-                            assertVariableNull(doc, "TAB_EXTNUM", 3);
-
-                            assertVariable(doc, "TAB_EXTCAR", 0, "A");
-                            assertVariable(doc, "TAB_EXTCAR", 1, "");
-                            assertVariable(doc, "TAB_EXTCAR", 2, "B");
-                        }
-                ),
-                Arguments.of(
-                        "AUTO200",
-                        /* expectedVarCount */ 11,
-                        (Consumer<ContextualExternalVariableDocument>) doc -> {
-                            assertVariable(doc, "TVA", "");
-                            assertVariable(doc, "COM_AUTRE", "");
-                            assertVariable(doc, "SECTEUR", "123456789");
-                            assertVariable(doc, "INTERRO_N_1", false);
-                            assertVariable(doc, "INTERRO_N_2", false);
-                            assertVariable(doc, "NAF25", "1014Z");
-                            assertVariable(doc, "POIDS", 12);
-                            assertVariable(doc, "MILLESIME", "2024");
-                            assertVariable(doc, "NSUBST", false);
-
-                            assertVariable(doc, "TAB_EXTNUM", 0, 10);
-                            assertVariable(doc, "TAB_EXTCAR", 0, "C");
-                            assertVariable(doc, "TAB_EXTCAR", 1, "C");
-                        }
-                )
-        );
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"invalid_syntax.json",
-            "not_a_json.xml",
-            "no_interrogationId.json",
-            "only_one_interrogationId.json",
-            "double_interrogationId.json"}
-    )
-    @SneakyThrows
-    void readExternalJson_error_400(String fileName){
-        //GIVEN
-        Path contextualPath = SOURCE_PATH_EXTERNAL.resolve("contextual");
-        Files.createDirectories(contextualPath);
-
-        Files.copy(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY)
-                        .resolve("contextual_external")
-                        .resolve(fileName),
-                contextualPath.resolve(fileName),
-                StandardCopyOption.REPLACE_EXISTING
-        );
-
-        //WHEN + THEN
-        ResponseEntity<Object> response = contextualVariableController.readContextualExternalJson(QUESTIONNAIRE_ID_EXTERNAL, Mode.WEB, fileName);
-        Assertions.assertEquals(400,response.getStatusCode().value());
-    }
-
-    //UTILS
-    //THEN
-    private static void assertVariable(ContextualPreviousVariableDocument document,
-                                       String variableName,
-                                       String expectedValue
-    ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));
-    }
-
-    private static void assertVariable(ContextualPreviousVariableDocument document,
-                                       String variableName,
-                                       double expectedValue
-    ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertInstanceOf(Double.class,document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));
-    }
-
-    private static void assertVariable(ContextualPreviousVariableDocument document,
-                                       String variableName,
-                                       boolean expectedValue
-    ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertInstanceOf(Boolean.class,document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));    }
-
-    private static void assertVariable(ContextualPreviousVariableDocument document,
-                                       String variableName,
-                                       int expectedValue
-    ) {
-        Object actual = document.getVariables().get(variableName);
-        Assertions.assertNotNull(actual);
-
-        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
-
-        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());    }
-
-    private static void assertVariableNull(ContextualPreviousVariableDocument document,
-                                           String variableName
-    ) {
-        Assertions.assertNull(document.getVariables().get(variableName));
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void assertVariableNull(ContextualPreviousVariableDocument document,
-                                           String arrayVariableName,
-                                           int index    ) {
-        var list = (List<Object>) document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size()>index);
-        Assertions.assertNull(list.get(index));
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void assertVariable(ContextualPreviousVariableDocument document,
-                                       String arrayVariableName,
-                                       int index,
-                                       String expectedValue
-    ) throws ClassCastException{
-        var list = (List<Object>)document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size()>index);
-        Assertions.assertInstanceOf(String.class,list.get(index));
-        Assertions.assertEquals(expectedValue,list.get(index));
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void assertVariable(ContextualPreviousVariableDocument document,
-                                       String arrayVariableName,
-                                       int index,
-                                       int expectedValue
-    ){
-        List<Object> list = (List<Object>) document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size() > index);
-        Object actual = list.get(index);
-        Assertions.assertNotNull(actual);
-
-        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
-
-        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());
-    }
-
-    private List<ContextualPreviousVariableDocument> getContextualPreviousTestDocuments() {
-        List<ContextualPreviousVariableDocument> contextualPreviousVariableDocumentList = new ArrayList<>();
-
-        ContextualPreviousVariableDocument contextualPreviousVariableDocument = new ContextualPreviousVariableDocument();
-        contextualPreviousVariableDocument.setQuestionnaireId(QUESTIONNAIRE_ID);
-        contextualPreviousVariableDocument.setInterrogationId(INTERROGATION_ID_1);
-        contextualPreviousVariableDocument.setVariables(new HashMap<>());
-        contextualPreviousVariableDocument.getVariables().put("TEXTECOURT", "");
-        contextualPreviousVariableDocument.getVariables().put("TEXTELONG", "test d'une donnée antérieure sur un texte long pour voir comment ça marche");
-        contextualPreviousVariableDocument.getVariables().put("FLOAT", 50.25d);
-        contextualPreviousVariableDocument.getVariables().put("INTEGER", null);
-        contextualPreviousVariableDocument.getVariables().put("BOOLEEN", true);
-        contextualPreviousVariableDocument.getVariables().put("DROPDOWN", "03");
-        contextualPreviousVariableDocument.getVariables().put("QCM_B1", true);
-        contextualPreviousVariableDocument.getVariables().put("QCM_B2", false);
-        contextualPreviousVariableDocument.getVariables().put("QCM_B4", true);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A11", 200);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A12", 150);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A23", 1000);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A24", null);
-        contextualPreviousVariableDocument.getVariables().put("TABOFATS1", List.of("AA","","BB","CC"));
-        contextualPreviousVariableDocument.getVariables().put("TABOFATS3", Arrays.asList(5,null,3));
-        contextualPreviousVariableDocumentList.add(contextualPreviousVariableDocument);
-
-        contextualPreviousVariableDocument = new ContextualPreviousVariableDocument();
-        contextualPreviousVariableDocument.setQuestionnaireId(QUESTIONNAIRE_ID);
-        contextualPreviousVariableDocument.setInterrogationId(INTERROGATION_ID_2);
-        contextualPreviousVariableDocument.setVariables(new HashMap<>());
-        contextualPreviousVariableDocument.getVariables().put("TEXTECOURT", "test previous");
-        contextualPreviousVariableDocument.getVariables().put("TEXTELONG", "");
-        contextualPreviousVariableDocument.getVariables().put("FLOAT", 12.2d);
-        contextualPreviousVariableDocument.getVariables().put("BOOLEEN", false);
-        contextualPreviousVariableDocument.getVariables().put("DROPDOWN", "");
-        contextualPreviousVariableDocument.getVariables().put("QCM_B1", false);
-        contextualPreviousVariableDocument.getVariables().put("QCM_B2", false);
-        contextualPreviousVariableDocument.getVariables().put("QCM_B5", true);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A11", 1);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A12", 2);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A23", 3);
-        contextualPreviousVariableDocument.getVariables().put("TABLEAU2A24", 4);
-        contextualPreviousVariableDocument.getVariables().put("TABOFATS1", List.of("BB","BB"));
-        contextualPreviousVariableDocument.getVariables().put("TABOFATS3", List.of(10,4,0));
-        contextualPreviousVariableDocumentList.add(contextualPreviousVariableDocument);
-
-        return contextualPreviousVariableDocumentList;
-    }
-
-    private List<ContextualExternalVariableDocument> getContextualExternalTestDocuments() {
-        List<ContextualExternalVariableDocument> contextualExternalVariableDocumentList = new ArrayList<>();
-
-        ContextualExternalVariableDocument contextualExternalVariableDocument = new ContextualExternalVariableDocument();
-        contextualExternalVariableDocument.setQuestionnaireId(QUESTIONNAIRE_ID);
-        contextualExternalVariableDocument.setInterrogationId(INTERROGATION_ID_1);
-        contextualExternalVariableDocument.setVariables(new HashMap<>());
-        contextualExternalVariableDocument.getVariables().put("TVA", 302.34d);
-        contextualExternalVariableDocument.getVariables().put("CA", 22.45d);
-        contextualExternalVariableDocument.getVariables().put("COM_AUTRE", "blablablabla");
-        contextualExternalVariableDocument.getVariables().put("SECTEUR", "110110110");
-        contextualExternalVariableDocument.getVariables().put("CATEGORIE", "");
-        contextualExternalVariableDocument.getVariables().put("INTERRO_N_1", true);
-        contextualExternalVariableDocument.getVariables().put("INTERRO_N_2", false);
-        contextualExternalVariableDocument.getVariables().put("NAF25", "9560Y");
-        contextualExternalVariableDocument.getVariables().put("POIDS", null);
-        contextualExternalVariableDocument.getVariables().put("MILLESIME", "2024");
-        contextualExternalVariableDocument.getVariables().put("NSUBST", true);
-        contextualExternalVariableDocument.getVariables().put("TAB_EXTNUM", Arrays.asList(50,23,10,null));
-        contextualExternalVariableDocument.getVariables().put("TAB_EXTCAR", Arrays.asList("A", "", "B"));
-        contextualExternalVariableDocumentList.add(contextualExternalVariableDocument);
-        return contextualExternalVariableDocumentList;
-    }
-
-
-    private void assertDocumentEqualToDto(ContextualPreviousVariableDocument contextualPreviousVariableDocument,
-                                          ContextualVariableModel contextualVariableModel) {
-        //For each variable of document
-        for (Map.Entry<String, Object> documentVariable : contextualPreviousVariableDocument.getVariables().entrySet()) {
-            //Get contextual previous dtos of that variable (1 per iteration)
-            List<VariableQualityToolDto> variableQualityToolDtosOfEntry =
-                    contextualVariableModel.contextualPrevious().stream().filter(
-                            variableQualityToolDto -> variableQualityToolDto.getVariableName().equals(documentVariable.getKey())
-                    ).toList();
-            assertEntryEqualToDto(documentVariable, variableQualityToolDtosOfEntry);
-        }
-    }
-
-    private void assertDocumentEqualToDto(ContextualExternalVariableDocument contextualExternalVariableDocument,
-                                          ContextualVariableModel contextualVariableModel) {
-        //For each variable of document
-        for (Map.Entry<String, Object> documentVariable : contextualExternalVariableDocument.getVariables().entrySet()) {
-            //Get contextual previous dtos of that variable (1 per iteration)
-            List<VariableQualityToolDto> variableQualityToolDtosOfEntry =
-                    contextualVariableModel.contextualExternal().stream().filter(
-                            variableQualityToolDto -> variableQualityToolDto.getVariableName().equals(documentVariable.getKey())
-                    ).toList();
-            assertEntryEqualToDto(documentVariable, variableQualityToolDtosOfEntry);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void assertEntryEqualToDto(Map.Entry<String, Object> documentVariable,
-                                       List<VariableQualityToolDto> variableQualityToolDtosOfEntry) {
-        Assertions.assertFalse(variableQualityToolDtosOfEntry.isEmpty());
-
-        //If that variable is not a list
-        if (!(documentVariable.getValue() instanceof List<?>)) {
-            Assertions.assertEquals(1,variableQualityToolDtosOfEntry.size());
-            List<VariableStateDto> variableStateDtos =
-                    variableQualityToolDtosOfEntry.getFirst().getVariableStateDtoList();
-
-            Assertions.assertEquals(1,variableStateDtos.size()); // Only 1 state
-            Assertions.assertEquals(DataState.COLLECTED,variableStateDtos.getFirst().getState());
-            Assertions.assertEquals(documentVariable.getValue(),variableStateDtos.getFirst().getValue());
-            return;
-        }
-        int i = 1;
-        for (Object documentVariableElement : (List<Object>) documentVariable.getValue()) {
-            int finalI = i;
-            List<VariableQualityToolDto> variableQualityToolDtosOfIteration =
-                    variableQualityToolDtosOfEntry.stream().filter(
-                            variableQualityToolDto -> variableQualityToolDto.getIteration().equals(finalI)
-                    ).toList();
-            Assertions.assertEquals(1,variableQualityToolDtosOfIteration.size());
-
-            List<VariableStateDto> variableStateDtos =
-                    variableQualityToolDtosOfIteration.getFirst().getVariableStateDtoList();
-            Assertions.assertEquals(1,variableStateDtos.size());
-            Assertions.assertEquals(DataState.COLLECTED,variableStateDtos.getFirst().getState());
-            Assertions.assertEquals(documentVariableElement,variableStateDtos.getFirst().getValue());
-            i++;
-        }
-    }
-
-    private static void assertVariable(ContextualExternalVariableDocument document,
-                                       String variableName,
-                                       String expectedValue
-    ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));
-    }
-
-    private static void assertVariable(ContextualExternalVariableDocument document,
-                                       String variableName,
-                                       double expectedValue
-    ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertInstanceOf(Double.class,document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));
-    }
-
-    private static void assertVariable(ContextualExternalVariableDocument document,
-                                       String variableName,
-                                       boolean expectedValue
-    ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertInstanceOf(Boolean.class,document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));        }
-
-    private static void assertVariable(ContextualExternalVariableDocument document,
-                                       String variableName,
-                                       int expectedValue
-    ) {
-        Object actual = document.getVariables().get(variableName);
-        Assertions.assertNotNull(actual);
-        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
-        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void assertVariableNull(ContextualExternalVariableDocument document,
-                                           String arrayVariableName,
-                                           int index
-    ) {
-        List<Object> list = (List<Object>)document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size()>index);
-        Assertions.assertNull(list.get(index));
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void assertVariable(ContextualExternalVariableDocument document,
-                                       String arrayVariableName,
-                                       int index,
-                                       String expectedValue
-    ) throws ClassCastException{
-        List<Object> list = (List<Object>)document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size()>index);
-        Assertions.assertInstanceOf(String.class,list.get(index));
-        Assertions.assertEquals(expectedValue,list.get(index));
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void assertVariable(ContextualExternalVariableDocument document,
-                                       String arrayVariableName,
-                                       int index,
-                                       int expectedValue
-    ){
-        List<Object> list = (List<Object>) document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size() > index);
-        Object actual = list.get(index);
-        Assertions.assertNotNull(actual);
-
-        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
-
-        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());
-
-    }
-}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/ContextualVariableControllerUnitTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/ContextualVariableControllerUnitTest.java
new file mode 100644
index 00000000..933db78f
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/ContextualVariableControllerUnitTest.java
@@ -0,0 +1,180 @@
+package fr.insee.genesis.controller.rest.responses;
+
+import fr.insee.genesis.Constants;
+import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.domain.model.contextualvariable.ContextualVariableModel;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.ports.api.ContextualExternalVariableApiPort;
+import fr.insee.genesis.domain.ports.api.ContextualPreviousVariableApiPort;
+import fr.insee.genesis.domain.ports.api.ContextualVariableApiPort;
+import fr.insee.genesis.infrastructure.utils.FileUtils;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.http.ResponseEntity;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ContextualVariableControllerUnitTest {
+
+    @Mock
+    private ContextualPreviousVariableApiPort contextualPreviousVariableApiPort;
+    @Mock
+    private ContextualExternalVariableApiPort contextualExternalVariableApiPort;
+    @Mock
+    private ContextualVariableApiPort contextualVariableApiPort;
+
+    private ContextualVariableController contextualVariableController;
+
+    @BeforeEach
+    void setUp() {
+        contextualVariableController = new ContextualVariableController(
+            contextualPreviousVariableApiPort,
+            contextualExternalVariableApiPort,
+            contextualVariableApiPort,
+            TestConstants.getConfigStub()
+        );
+    }
+
+    @Test
+    void getContextualVariables() {
+        //GIVEN
+        ContextualVariableModel contextualVariableModel = ContextualVariableModel.builder().build();
+        doReturn(contextualVariableModel).when(contextualVariableApiPort).getContextualVariable(
+            any(), any()
+        );
+
+        //WHEN
+        ResponseEntity<Object> response = contextualVariableController.getContextualVariables(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                TestConstants.DEFAULT_INTERROGATION_ID
+        );
+
+        //THEN
+        verify(contextualVariableApiPort, times(1)).getContextualVariable(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                TestConstants.DEFAULT_INTERROGATION_ID
+        );
+        Assertions.assertThat(response.getBody())
+                .isInstanceOf(ContextualVariableModel.class)
+                .isEqualTo(contextualVariableModel);
+    }
+
+    @Test
+    @SneakyThrows
+    void saveContextualVariables() {
+        //WHEN
+        contextualVariableController.saveContextualVariables(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+        );
+
+        //THEN
+        verify(contextualVariableApiPort, times(1)).saveContextualVariableFiles(
+                eq(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID),
+                any(),
+                any()
+        );
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualPreviousJson() {
+        //GIVEN
+        FileUtils fileUtils = new FileUtils(TestConstants.getConfigStub());
+        String expectedFilePath = "%s%s/%s".formatted(
+                fileUtils.getDataFolder(
+                        TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                        Mode.WEB.getFolder(),
+                        null
+                ),
+                Constants.CONTEXTUAL_FOLDER,
+                "ok.json"
+        );
+
+        //WHEN
+        contextualVariableController.readContextualPreviousJson(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                Mode.WEB,
+                null,
+                "ok.json"
+        );
+
+        //THEN
+        verify(contextualPreviousVariableApiPort, times(1)).readContextualPreviousFile(
+                eq(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID),
+                any(),
+                eq(expectedFilePath)
+        );
+    }
+
+    @Test
+    void readContextualPreviousJson_notJson() {
+        //WHEN
+        ResponseEntity<Object> response = contextualVariableController.readContextualPreviousJson(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                Mode.WEB,
+                null,
+                "ok.xml"
+        );
+
+        //THEN
+        verifyNoInteractions(contextualPreviousVariableApiPort);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualExternalJson() {
+        //GIVEN
+        FileUtils fileUtils = new FileUtils(TestConstants.getConfigStub());
+        String expectedFilePath = "%s%s/%s".formatted(
+                fileUtils.getDataFolder(
+                        TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                        Mode.WEB.getFolder(),
+                        null
+                ),
+                Constants.CONTEXTUAL_FOLDER,
+                "ok.json"
+        );
+
+        //WHEN
+        contextualVariableController.readContextualExternalJson(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                Mode.WEB,
+                "ok.json"
+        );
+
+        //THEN
+        verify(contextualExternalVariableApiPort, times(1)).readContextualExternalFile(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                expectedFilePath
+        );
+    }
+
+    @Test
+    void readContextualExternalJson_notJson() {
+        //WHEN
+        ResponseEntity<Object> response = contextualVariableController.readContextualExternalJson(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                Mode.WEB,
+                "ok.xml"
+        );
+
+        //THEN
+        verifyNoInteractions(contextualExternalVariableApiPort);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
index 3ce42bff..7364a162 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
@@ -1,68 +1,127 @@
 package fr.insee.genesis.controller.rest.responses;
 
+import fr.insee.genesis.TestConstants;
 import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.ResponseEntity;
 
-import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.List;
 
-import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 class InterrogationControllerTest {
-    //Given
-    static InterrogationController interrogationControllerStatic;
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-
-    @BeforeAll
-    static void init() {
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-        SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
-                surveyUnitPersistencePortStub,
-                new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub()),
-                new FileUtils(new ConfigStub())
-        );
+    @Mock
+    private SurveyUnitApiPort surveyUnitApiPort;
 
-        interrogationControllerStatic = new InterrogationController( surveyUnitApiPort );
+    @InjectMocks
+    private InterrogationController interrogationController;
 
+    @Test
+    void getAllInterrogationIdsByQuestionnaire_test() {
+        //GIVEN
+        List<InterrogationId> interrogationIds = List.of(
+                new InterrogationId("test"),
+                new InterrogationId("test2"));
+        doReturn(interrogationIds).when(surveyUnitApiPort).findDistinctInterrogationIdsByQuestionnaireId(any());
+
+        //WHEN
+        ResponseEntity<List<InterrogationId>> response =
+                interrogationController.getAllInterrogationIdsByQuestionnaire(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+
+        //THEN
+        verify(surveyUnitApiPort, times(1)).findDistinctInterrogationIdsByQuestionnaireId(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(interrogationIds);
     }
 
-    @BeforeEach
-    void reset() throws IOException {
-       Utils.reset(surveyUnitPersistencePortStub);
-    }
+    @Test
+    void getAllInterrogationIdsByQuestionnaire_date_test() {
+        //GIVEN
+        LocalDateTime since = LocalDateTime.now();
+        List<InterrogationId> interrogationIds = List.of(
+                new InterrogationId("test"));
+        doReturn(interrogationIds).when(surveyUnitApiPort).findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(
+                any(),
+                any()
+        );
 
 
-    //When + Then
-    @Test
-    void getAllInterrogationIdsByQuestionnaireTest() {
-        ResponseEntity<List<InterrogationId>> response = interrogationControllerStatic.getAllInterrogationIdsByQuestionnaire(DEFAULT_COLLECTION_INSTRUMENT_ID);
+        //WHEN
+        ResponseEntity<List<InterrogationId>> response =
+            interrogationController.getAllInterrogationIdsByQuestionnaire(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                    since
+            );
 
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
-        Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
+        //THEN
+        verify(surveyUnitApiPort, times(1)).findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                since
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(interrogationIds);
     }
 
     @Test
-    void countAllInterrogationIdsByQuestionnaireOrCollectionInstrumentTest() {
-        ResponseEntity<Long> response = interrogationControllerStatic.countAllInterrogationIdsByQuestionnaireOrCollectionInstrument(DEFAULT_COLLECTION_INSTRUMENT_ID);
+    void countAllInterrogationIdsByQuestionnaireOrCollectionInstrument() {
+        //GIVEN
+        long questionnaireCount = 2;
+        long collectionInstrumentCount = 3;
+        doReturn(questionnaireCount).when(surveyUnitApiPort).countResponsesByQuestionnaireId(any());
+        doReturn(collectionInstrumentCount).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(any());
+
+        //WHEN
+        ResponseEntity<Long> response = interrogationController.countAllInterrogationIdsByQuestionnaireOrCollectionInstrument(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+        );
 
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull();
-        Assertions.assertThat(response.getBody()).isEqualTo(1L);
+        //THEN
+        verify(surveyUnitApiPort, times(1)).countResponsesByQuestionnaireId(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+        );
+        verify(surveyUnitApiPort, times(1)).countResponsesByCollectionInstrumentId(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(collectionInstrumentCount + questionnaireCount);
     }
 
+    @Test
+    void getPaginatedInterrogationIdsByQuestionnaire_test() {
+        //GIVEN
+        List<InterrogationId> interrogationIds = List.of(
+                new InterrogationId("test"),
+                new InterrogationId("test2"));
+        doReturn(interrogationIds).when(surveyUnitApiPort).findDistinctPageableInterrogationIdsByQuestionnaireId(
+                any(), anyLong(), anyLong(), anyLong()
+        );
 
+        //WHEN
+        ResponseEntity<List<InterrogationId>> response = interrogationController.getPaginatedInterrogationIdsByQuestionnaire(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                0,
+                1000,
+                0
+        );
 
-}
+        //THEN
+        verify(surveyUnitApiPort, times(1)).findDistinctPageableInterrogationIdsByQuestionnaireId(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                0,
+                1000,
+                0
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(interrogationIds);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java
index 8220c066..626ca1cd 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java
@@ -1,86 +1,59 @@
 package fr.insee.genesis.controller.rest.responses;
 
+import fr.insee.genesis.TestConstants;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
+import fr.insee.genesis.exceptions.QuestionnaireNotFoundException;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-import java.io.IOException;
 import java.util.List;
 
-import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 class ModeControllerTest {
-    public static final String CAMPAIGN_ID = "TEST-TABLEAUX";
-    //Given
-    static ModeController modeControllerStatic;
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
+    @Mock
+    private SurveyUnitApiPort surveyUnitApiPort;
 
-    @BeforeAll
-    static void init() {
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-        SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
-                surveyUnitPersistencePortStub,
-                new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub()),
-                new FileUtils(new ConfigStub())
-        );
-
-        modeControllerStatic = new ModeController( surveyUnitApiPort );
-
-    }
+    @InjectMocks
+    private ModeController modeController;
 
-    @BeforeEach
-    void reset() throws IOException {
-        Utils.reset(surveyUnitPersistencePortStub);
-    }
-
-
-    //When + Then
     @Test
-    void getModesByQuestionnaireTest() {
-        ResponseEntity<List<Mode>> response = modeControllerStatic.getModesByQuestionnaire(DEFAULT_COLLECTION_INSTRUMENT_ID);
+    void getModesByQuestionnaire() {
+        //GIVEN
+        List<Mode> modes = List.of(Mode.WEB, Mode.F2F);
+        doReturn(modes).when(surveyUnitApiPort).findModesByCollectionInstrumentId(any());
 
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().hasSize(1);
-        Assertions.assertThat(response.getBody().getFirst()).isEqualTo(Mode.WEB);
-    }
+        //WHEN
+        ResponseEntity<List<Mode>> response = modeController.getModesByQuestionnaire(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
 
-    @Test
-    void getModesByCampaignTest() {
-        ResponseEntity<List<Mode>> response = modeControllerStatic.getModesByCampaign(CAMPAIGN_ID);
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().hasSize(1);
-        Assertions.assertThat(response.getBody().getFirst()).isEqualTo(Mode.WEB);
+        //THEN
+        verify(surveyUnitApiPort, times(1)).findModesByCollectionInstrumentId(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(modes);
     }
 
-    //========= OPTIMISATIONS PERFS (START) ==========
     @Test
-    void getModesByQuestionnaireV2Test() {
-        ResponseEntity<List<Mode>> response = modeControllerStatic.getModesByQuestionnaireV2(DEFAULT_COLLECTION_INSTRUMENT_ID);
+    void getModesByQuestionnaire_not_found() {
+        //GIVEN
+        doThrow(QuestionnaireNotFoundException.class).when(surveyUnitApiPort).findModesByCollectionInstrumentId(any());
 
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().hasSize(1);
-        Assertions.assertThat(response.getBody().getFirst()).isEqualTo(Mode.WEB);
-    }
+        //WHEN
+        ResponseEntity<List<Mode>> response = modeController.getModesByQuestionnaire(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
 
-    @Test
-    void getModesByCampaignV2Test() {
-        ResponseEntity<List<Mode>> response = modeControllerStatic.getModesByCampaignV2(CAMPAIGN_ID);
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().hasSize(1);
-        Assertions.assertThat(response.getBody().getFirst()).isEqualTo(Mode.WEB);
+        //THEN
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(HttpStatus.NOT_FOUND.value());
     }
-    //========= OPTIMISATIONS PERFS (END) ==========
-
-}
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerTest.java
deleted file mode 100644
index 094e32c5..00000000
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package fr.insee.genesis.controller.rest.responses;
-
-import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
-import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.service.context.DataProcessingContextService;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.ResponseEntity;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
-
-class QuestionnaireControllerTest {
-    //Given
-    static QuestionnaireController questionnaireControllerStatic;
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-    static DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub;
-
-    @BeforeAll
-    static void init() {
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-        dataProcessingContextPersistancePortStub = new DataProcessingContextPersistancePortStub();
-        SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
-                surveyUnitPersistencePortStub,
-                new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub()),
-                new FileUtils(new ConfigStub())
-        );
-
-        questionnaireControllerStatic = new QuestionnaireController(
-                surveyUnitApiPort,
-                new DataProcessingContextService(dataProcessingContextPersistancePortStub, surveyUnitPersistencePortStub)
-        );
-
-    }
-
-    @BeforeEach
-    void reset() throws IOException {
-        dataProcessingContextPersistancePortStub.getMongoStub().clear();
-        Utils.reset(surveyUnitPersistencePortStub);
-    }
-
-
-    //When + Then
-
-    @Test
-    void getQuestionnairesTest() {
-        Utils.addAdditionalSurveyUnitModelToMongoStub("TESTQUESTIONNAIRE2", surveyUnitPersistencePortStub);
-
-        ResponseEntity<Set<String>> response = questionnaireControllerStatic.getQuestionnaires();
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
-                DEFAULT_COLLECTION_INSTRUMENT_ID,"TESTQUESTIONNAIRE2");
-    }
-
-    @Test
-    void getQuestionnairesWithReviewTest() {
-
-        String questionnaireId = "TESTQUESTIONNAIRE2";
-        Utils.addAdditionalSurveyUnitModelToMongoStub(questionnaireId, surveyUnitPersistencePortStub);
-
-        ResponseEntity<List<String>> response = questionnaireControllerStatic.getQuestionnairesWithReview(true);
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isEmpty();
-
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setCollectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID);
-        doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc.setWithReview(true);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
-
-        response = questionnaireControllerStatic.getQuestionnairesWithReview(true);
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
-                DEFAULT_COLLECTION_INSTRUMENT_ID);
-
-        DataProcessingContextDocument doc2 = new DataProcessingContextDocument();
-        doc2.setCollectionInstrumentId(questionnaireId);
-        doc2.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc2.setWithReview(false);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc2);
-
-        response = questionnaireControllerStatic.getQuestionnairesWithReview(true);
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
-                DEFAULT_COLLECTION_INSTRUMENT_ID);
-    }
-
-    @Test
-    void getQuestionnairesWithoutReviewTest() {
-
-        String questionnaireId = "TESTQUESTIONNAIRE2";
-        Utils.addAdditionalSurveyUnitModelToMongoStub(questionnaireId, surveyUnitPersistencePortStub);
-
-        ResponseEntity<List<String>> response = questionnaireControllerStatic.getQuestionnairesWithReview(false);
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isEmpty();
-
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setCollectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID);
-        doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc.setWithReview(false);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
-
-        response = questionnaireControllerStatic.getQuestionnairesWithReview(false);
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
-                DEFAULT_COLLECTION_INSTRUMENT_ID);
-
-        DataProcessingContextDocument doc2 = new DataProcessingContextDocument();
-        doc2.setCollectionInstrumentId(questionnaireId);
-        doc2.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc2.setWithReview(true);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc2);
-        response = questionnaireControllerStatic.getQuestionnairesWithReview(false);
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
-                DEFAULT_COLLECTION_INSTRUMENT_ID);
-    }
-
-    @Test
-    void getQuestionnairesByCampaignTest() {
-        Utils.addAdditionalSurveyUnitModelToMongoStub("TESTQUESTIONNAIRE2", surveyUnitPersistencePortStub);
-
-        ResponseEntity<Set<String>> response = questionnaireControllerStatic.getQuestionnairesByCampaign("TEST-TABLEAUX");
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
-                DEFAULT_COLLECTION_INSTRUMENT_ID,"TESTQUESTIONNAIRE2");
-    }
-
-
-    @Test
-    void getQuestionnairesWithCampaignsTest() {
-        Utils.addAdditionalSurveyUnitModelToMongoStub("TESTQUESTIONNAIRE2", surveyUnitPersistencePortStub);
-        Utils.addAdditionalSurveyUnitModelToMongoStub("TESTCAMPAIGN2","TESTQUESTIONNAIRE2", surveyUnitPersistencePortStub);
-
-        ResponseEntity<List<QuestionnaireWithCampaign>> response = questionnaireControllerStatic.getQuestionnairesWithCampaigns();
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
-        Assertions.assertThat(response.getBody().stream().filter(questionnaireWithCampaign ->
-                questionnaireWithCampaign.getQuestionnaireId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                        || questionnaireWithCampaign.getQuestionnaireId().equals("TESTQUESTIONNAIRE2")
-        )).isNotNull().isNotEmpty().hasSize(2);
-
-        Assertions.assertThat(response.getBody().stream().filter(
-                questionnaireWithCampaign -> questionnaireWithCampaign.getQuestionnaireId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-        ).findFirst().get().getCampaigns()).containsExactly("TEST-TABLEAUX");
-
-        Assertions.assertThat(response.getBody().stream().filter(
-                questionnaireWithCampaign -> questionnaireWithCampaign.getQuestionnaireId().equals("TESTQUESTIONNAIRE2")
-        ).findFirst().get().getCampaigns()).containsExactly("TEST-TABLEAUX", "TESTCAMPAIGN2");
-    }
-
-}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerUnitTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerUnitTest.java
index cd764441..d83a4938 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerUnitTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerUnitTest.java
@@ -1,34 +1,81 @@
 package fr.insee.genesis.controller.rest.responses;
 
+import fr.insee.genesis.TestConstants;
 import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import org.junit.jupiter.api.BeforeEach;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.ResponseEntity;
 
+import java.util.List;
+import java.util.Set;
+
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 class QuestionnaireControllerUnitTest {
+    @Mock
+    private DataProcessingContextApiPort dataProcessingContextApiPort;
+
+    @Mock
+    private SurveyUnitApiPort surveyUnitApiPort;
 
+    @InjectMocks
     private QuestionnaireController questionnaireController;
-    private DataProcessingContextApiPort dataProcessingContextApiPort;
 
-    @BeforeEach
-    void setUp() {
-        dataProcessingContextApiPort = mock(DataProcessingContextApiPort.class);
-        questionnaireController = new QuestionnaireController(
-                mock(SurveyUnitApiPort.class),
-                dataProcessingContextApiPort
-        );
+    @Test
+    void getQuestionnaires_test() {
+        //GIVEN
+        Set<String> questionnaires = Set.of("test", "test2");
+        doReturn(questionnaires).when(surveyUnitApiPort).findDistinctQuestionnairesAndCollectionInstrumentIds();
+
+        //WHEN
+        ResponseEntity<Set<String>> response = questionnaireController.getQuestionnaires();
+
+        //THEN
+        verify(surveyUnitApiPort, times(1))
+                .findDistinctQuestionnairesAndCollectionInstrumentIds();
+        Assertions.assertThat(response.getBody()).isEqualTo(questionnaires);
     }
 
     @Test
-    void getQuestionnairesWithReviewTest() {
+    void getQuestionnairesWithReview_test() {
+        //GIVEN
+        List<String> questionnaires = List.of("test");
+        doReturn(questionnaires).when(dataProcessingContextApiPort).getCollectionInstrumentIds(anyBoolean());
+
+        //WHEN
+        ResponseEntity<List<String>> response = questionnaireController.getQuestionnairesWithReview(true);
+
+        //THEN
+        verify(dataProcessingContextApiPort, times(1)).getCollectionInstrumentIds(true);
+        Assertions.assertThat(response.getBody()).isEqualTo(questionnaires);
+    }
+
+    @Test
+    @SneakyThrows
+    void getQuestionnaireByInterrogation_test() {
+        //GIVEN
+        String questionnaireId = "test";
+        doReturn(questionnaireId).when(surveyUnitApiPort)
+                .findQuestionnaireIdByInterrogationId(any());
+
         //WHEN
-        questionnaireController.getQuestionnairesWithReview(true);
+        ResponseEntity<String> response = questionnaireController.getQuestionnaireByInterrogation(TestConstants.DEFAULT_INTERROGATION_ID);
 
-        verify(dataProcessingContextApiPort, times(1)).getCollectionInstrumentIds(anyBoolean());
+        //THEN
+        verify(surveyUnitApiPort, times(1)).findQuestionnaireIdByInterrogationId(
+                TestConstants.DEFAULT_INTERROGATION_ID
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(questionnaireId);
     }
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java
index 533740dc..1c71a44d 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java
@@ -1,496 +1,764 @@
 package fr.insee.genesis.controller.rest.responses;
 
-
-import fr.insee.bpm.metadata.model.VariablesMap;
-import fr.insee.genesis.controller.dto.rawdata.LunaticJsonRawDataUnprocessedDto;
-import fr.insee.genesis.controller.utils.ControllerUtils;
-import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
 import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
 import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
-import fr.insee.genesis.domain.service.context.DataProcessingContextService;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.rawdata.LunaticJsonRawDataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.domain.utils.JsonUtils;
-import fr.insee.genesis.exceptions.GenesisError;
+import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.exceptions.GenesisException;
-import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
-import fr.insee.genesis.infrastructure.document.rawdata.RawResponseDocument;
-import fr.insee.genesis.infrastructure.mappers.DataProcessingContextMapper;
+import fr.insee.genesis.infrastructure.repository.ContextualExternalVariableMongoDBRepository;
+import fr.insee.genesis.infrastructure.repository.ContextualPreviousVariableMongoDBRepository;
+import fr.insee.genesis.infrastructure.repository.DataProcessingContextMongoDBRepository;
+import fr.insee.genesis.infrastructure.repository.LastJsonExtractionMongoDBRepository;
+import fr.insee.genesis.infrastructure.repository.LunaticJsonMongoDBRepository;
+import fr.insee.genesis.infrastructure.repository.LunaticModelMongoDBRepository;
+import fr.insee.genesis.infrastructure.repository.QuestionnaireMetadataMongoDBRepository;
 import fr.insee.genesis.infrastructure.repository.RawResponseInputRepository;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.LunaticJsonRawDataPersistanceStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.RawResponseDataPersistanceStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitQualityToolPerretAdapterStub;
-import fr.insee.modelefiliere.RawResponseDto;
-import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.Assertions;
+import fr.insee.genesis.infrastructure.repository.RawResponseRepository;
+import fr.insee.genesis.infrastructure.repository.RundeckExecutionDBRepository;
+import fr.insee.genesis.infrastructure.repository.SurveyUnitMongoDBRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PagedModel;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.web.servlet.MockMvc;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-
-@Slf4j
+import static org.hamcrest.Matchers.containsString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.http.HttpMethod.HEAD;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.request;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@ActiveProfiles("test")
+@EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
 class RawResponseControllerTest {
-    private final FileUtils fileUtils = new FileUtils(new ConfigStub());
-    private final LunaticJsonRawDataPersistanceStub lunaticJsonRawDataPersistanceStub = new LunaticJsonRawDataPersistanceStub();
-    private final RawResponseDataPersistanceStub rawResponseDataPersistanceStub = new RawResponseDataPersistanceStub();
-    private final SurveyUnitPersistencePortStub surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-    private final SurveyUnitQualityToolPerretAdapterStub surveyUnitQualityToolPerretAdapterStub = new SurveyUnitQualityToolPerretAdapterStub();
-    private final DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub =
-            new DataProcessingContextPersistancePortStub();
-    private static final QuestionnaireMetadataPersistencePortStub questionnaireMetadataPersistencePortStub =
-            new QuestionnaireMetadataPersistencePortStub();
-
 
-    private final LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = new LunaticJsonRawDataService(lunaticJsonRawDataPersistanceStub,
-            new ControllerUtils(fileUtils),
-            new QuestionnaireMetadataService(questionnaireMetadataPersistencePortStub),
-            new SurveyUnitService(surveyUnitPersistencePortStub, new QuestionnaireMetadataService(questionnaireMetadataPersistencePortStub), fileUtils),
-            new SurveyUnitQualityService(),
-            fileUtils,
-            new DataProcessingContextService(dataProcessingContextPersistancePortStub, surveyUnitPersistencePortStub),
-            surveyUnitQualityToolPerretAdapterStub,
-            new ConfigStub(),
-            new DataProcessingContextPersistancePortStub()
-    );
-
-    // TODO: change this
-    RawResponseInputRepository rawResponseInputRepositoryStub = new RawResponseInputRepository(null, null) {
-        @Override
-        public void saveAsRawJson(RawResponseDto dto) {
-            // Ne rien faire — stub pour les tests
+    @Autowired
+    private MockMvc mockMvc; // Simulates HTTP requests to the REST endpoints
+
+    /** MOCKS for initializing context, not used **/
+    @MockitoBean
+    private MongoTemplate mongoTemplate;
+    @MockitoBean
+    private SurveyUnitApiPort surveyUnitApiPort;
+    @MockitoBean
+    private LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort;
+    @MockitoBean
+    private RawResponseApiPort rawResponseApiPort;
+    @MockitoBean
+    private RawResponseInputRepository rawRepository;
+    @MockitoBean
+    private SurveyUnitMongoDBRepository surveyUnitMongoDBRepository;
+    @MockitoBean
+    private LastJsonExtractionMongoDBRepository lastJsonExtractionMongoDBRepository;
+    @MockitoBean
+    private LunaticJsonMongoDBRepository lunaticJsonMongoDBRepository;
+    @MockitoBean
+    private RundeckExecutionDBRepository rundeckExecutionDBRepository;
+    @MockitoBean
+    private DataProcessingContextMongoDBRepository dataProcessingContextMongoDBRepository;
+    @MockitoBean
+    private LunaticModelMongoDBRepository lunaticModelMongoDBRepository;
+    @MockitoBean
+    private ContextualPreviousVariableMongoDBRepository contextualPreviousVariableMongoDBRepository;
+    @MockitoBean
+    private ContextualExternalVariableMongoDBRepository contextualExternalVariableMongoDBRepository;
+    @MockitoBean
+    private QuestionnaireMetadataMongoDBRepository questionnaireMetadataMongoDBRepository;
+    @MockitoBean
+    private RawResponseRepository rawResponseRepository;
+
+    @Nested
+    @DisplayName("PUT /responses/raw/lunatic-json/save tests")
+    class SaveRawResponsesFromJsonBodyTests {
+
+        @Test
+        @WithMockUser(roles = "COLLECT_PLATFORM")
+        @DisplayName("Should return 201 on success")
+        void save_shouldReturn201() throws Exception {
+            // WHEN / THEN
+            mockMvc.perform(put("/responses/raw/lunatic-json/save")
+                            .with(csrf())
+                            .param("campaignName", "CAMPAIGN")
+                            .param("questionnaireId", "QUEST01")
+                            .param("interrogationId", "INTERRO01")
+                            .param("mode", Mode.WEB.name())
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("{}"))
+                    .andExpect(status().isCreated());
         }
-    };
 
-    RawResponseApiPort rawResponseApiPortStub = new RawResponseApiPort() {
-        @Override
-        public List<RawResponseModel> getRawResponses(String questionnaireModelId, Mode mode, List<String> interrogationIdList) {
-            return List.of();
+        @Test
+        @WithMockUser(roles = "COLLECT_PLATFORM")
+        @DisplayName("Should return success message with interrogationId")
+        void save_shouldReturnSuccessMessage() throws Exception {
+            // GIVEN
+
+            // WHEN / THEN
+            mockMvc.perform(put("/responses/raw/lunatic-json/save")
+                            .with(csrf())
+                            .param("campaignName", "CAMPAIGN")
+                            .param("questionnaireId", "QUEST01")
+                            .param("interrogationId", "INTERRO01")
+                            .param("mode", Mode.WEB.name())
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("{}"))
+                    .andExpect(content().string(containsString("INTERRO01")));
         }
 
-        @Override
-        public List<RawResponseModel> getRawResponsesByInterrogationID(String interrogationId) {
-            return List.of();
+        @Test
+        @WithMockUser(roles = "COLLECT_PLATFORM")
+        @DisplayName("Should return 500 when port throws an exception")
+        void save_portThrows_shouldReturn500() throws Exception {
+            // GIVEN
+            doThrow(new RuntimeException("DB error")).when(lunaticJsonRawDataApiPort).save(any());
+
+            // WHEN / THEN
+            mockMvc.perform(put("/responses/raw/lunatic-json/save")
+                            .with(csrf())
+                            .param("campaignName", "CAMPAIGN")
+                            .param("questionnaireId", "QUEST01")
+                            .param("interrogationId", "INTERRO01")
+                            .param("mode", Mode.WEB.name())
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("{}"))
+                    .andExpect(status().isInternalServerError())
+                    .andExpect(content().string(containsString("Unexpected error")));
         }
 
-        @Override
-        public DataProcessResult processRawResponses(String questionnaireId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException {
-            return null;
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have COLLECT_PLATFORM role")
+        void save_wrongRole_shouldReturn403() throws Exception {
+            // GIVEN
+
+            // WHEN / THEN
+            mockMvc.perform(put("/responses/raw/lunatic-json/save")
+                            .with(csrf())
+                            .param("campaignName", "CAMPAIGN")
+                            .param("questionnaireId", "QUEST01")
+                            .param("interrogationId", "INTERRO01")
+                            .param("mode", Mode.WEB.name())
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("{}"))
+                    .andExpect(status().isForbidden());
         }
+    }
 
-        @Override
-        public DataProcessResult processRawResponses(String collectionInstrumentId) throws GenesisException {
-            return null;
+    // -------------------------------------------------------------------------
+    // POST /raw-responses
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("POST /raw-responses tests")
+    class SaveRawResponsesFromDtoTests {
+
+        @Test
+        @WithMockUser(roles = "COLLECT_PLATFORM")
+        @DisplayName("Should return 201 and call repository")
+        void saveDto_shouldReturn201AndCallRepository() throws Exception {
+            // GIVEN
+            String body = getFiliereModelRawResponseBody();
+
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses")
+                            .with(csrf())
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content(body))
+                    .andExpect(status().isCreated())
+                    .andExpect(content().string(containsString("INTERRO01")));
+
+            verify(rawRepository).saveAsRawJson(any());
         }
 
-        @Override
-        public List<SurveyUnitModel> convertRawResponse(List<RawResponseModel> rawResponsModels, VariablesMap variablesMap) {
-            return List.of();
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have COLLECT_PLATFORM role")
+        void saveDto_wrongRole_shouldReturn403() throws Exception {
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses")
+                            .with(csrf())
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content(getFiliereModelRawResponseBody()))
+                    .andExpect(status().isForbidden());
         }
 
-        @Override
-        public List<String> getUnprocessedCollectionInstrumentIds() {
-            return List.of();
+        private String getFiliereModelRawResponseBody() {
+            return """
+                    {
+                          "partitionId": "RAWDATATESTCAMPAIGN",
+                          "collectionInstrumentId": "TESTQUEST",
+                          "usualSurveyUnitId": "TESTUE00001",
+                          "interrogationId": "INTERRO01",
+                          "mode": "CAWI",
+                          "isCapturedIndirectly": true,
+                          "questionnaireState": "FINISHED",
+                          "data": {}
+                    }
+                    """;
         }
+    }
 
-        @Override
-        public void updateProcessDates(List<SurveyUnitModel> surveyUnitModels) {
-
-        }
-        @Override
-        public Page<RawResponseModel> findRawResponseDataByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable) {
-            return rawResponseDataPersistanceStub.findByCampaignIdAndDate(campaignId, startDate, endDate, pageable);
+    // -------------------------------------------------------------------------
+    // POST /raw-responses/process
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("POST /raw-responses/process tests")
+    class ProcessRawResponsesTests {
+
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with count message when no formatted data")
+        void process_noFormatted_shouldReturnCountMessage() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.processRawResponses(eq("QUEST01"), anyList(), anyList()))
+                    .thenReturn(new DataProcessResult(10, 0, new ArrayList<>()));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses/process")
+                            .with(csrf())
+                            .param("collectionInstrumentId", "QUEST01")
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("[\"i1\",\"i2\"]"))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("10")))
+                    .andExpect(content().string(containsString("QUEST01")));
         }
 
-        @Override
-        public long countDistinctInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId) {
-            return 0;
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with formatted count message when formatted data present")
+        void process_withFormatted_shouldReturnFormattedCountMessage() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.processRawResponses(eq("QUEST01"), anyList(), anyList()))
+                    .thenReturn(new DataProcessResult(10, 3, new ArrayList<>()));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses/process")
+                            .with(csrf())
+                            .param("collectionInstrumentId", "QUEST01")
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("[\"i1\"]"))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("10")))
+                    .andExpect(content().string(containsString("3")))
+                    .andExpect(content().string(containsString("FORMATTED")));
         }
 
-        @Override
-        public long countByCollectionInstrumentId(String collectionInstrumentId) {
-            return 0;
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return GenesisException status when port throws")
+        void process_genesisException_shouldReturnExceptionStatus() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.processRawResponses(anyString(), anyList(), anyList()))
+                    .thenThrow(new GenesisException(404, "Not found"));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses/process")
+                            .with(csrf())
+                            .param("collectionInstrumentId", "QUEST01")
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("[\"i1\"]"))
+                    .andExpect(status().isNotFound())
+                    .andExpect(content().string(containsString("Not found")));
         }
 
-        @Override
-        public Set<String> getDistinctCollectionInstrumentIds() {
-            return Set.of();
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have SCHEDULER role")
+        void process_wrongRole_shouldReturn403() throws Exception {
+            // GIVEN
+
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses/process")
+                            .with(csrf())
+                            .param("collectionInstrumentId", "QUEST01")
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("[\"i1\"]"))
+                    .andExpect(status().isForbidden());
         }
-        
-        @Override
-        public Page<RawResponseModel> findRawResponseDataByCollectionInstrumentId(String collectionInstrumentId, Pageable pageable) {
-            return null;
+    }
+
+    // -------------------------------------------------------------------------
+    // POST /raw-responses/{collectionInstrumentId}/process
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("POST /raw-responses/{collectionInstrumentId}/process tests")
+    class ProcessRawResponsesByCollectionInstrumentIdTests {
+
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with count message")
+        void processByCollectionInstrumentId_shouldReturn200() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.processRawResponses("QUEST01"))
+                    .thenReturn(new DataProcessResult(5, 0, new ArrayList<>()));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses/QUEST01/process")
+                            .with(csrf()))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("5")));
         }
 
-        @Override
-        public boolean existsByInterrogationId(String interrogationId) {
-            return DEFAULT_INTERROGATION_ID.equals(interrogationId);
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return GenesisException status when port throws")
+        void processByCollectionInstrumentId_genesisException_shouldReturnExceptionStatus() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.processRawResponses(anyString()))
+                    .thenThrow(new GenesisException(422, "Unprocessable"));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/raw-responses/QUEST01/process")
+                            .with(csrf()))
+                    .andExpect(status().isUnprocessableEntity())
+                    .andExpect(content().string(containsString("Unprocessable")));
         }
-    };
+    }
 
-    private final RawResponseController rawResponseController = new RawResponseController(lunaticJsonRawDataApiPort,  rawResponseApiPortStub, rawResponseInputRepositoryStub);
+    // -------------------------------------------------------------------------
+    // GET /raw-responses/unprocessed/collection-instrument-ids
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("GET /raw-responses/unprocessed/collection-instrument-ids tests")
+    class GetUnprocessedCollectionInstrumentTests {
+
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with list of collection instrument ids")
+        void getUnprocessed_shouldReturn200WithIds() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.getUnprocessedCollectionInstrumentIds())
+                    .thenReturn(List.of("QUEST01", "QUEST02"));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/raw-responses/unprocessed/collection-instrument-ids"))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("QUEST01")));
+        }
 
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have SCHEDULER role")
+        void getUnprocessed_wrongRole_shouldReturn403() throws Exception {
+            // GIVEN
 
-    @Test
-    void saveJsonRawDataFromStringTest() throws Exception {
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "testIdQuest".toUpperCase();
-        String interrogationId = "testinterrogationId";
-        String idUE = "testIdUE";
-        Map<String,Object> json = JsonUtils.jsonToMap("{\"COLLECTED\": {\"testdata\": {\"COLLECTED\": [\"test\"]}}}");
+            // WHEN / THEN
+            mockMvc.perform(get("/raw-responses/unprocessed/collection-instrument-ids"))
+                    .andExpect(status().isForbidden());
+        }
+    }
 
-        //WHEN
-        ResponseEntity<String> response = rawResponseController.saveRawResponsesFromJsonBody(
-                campaignId
-                , questionnaireId
-                , interrogationId
-                , idUE
-                , Mode.WEB
-                , json
-        );
+    // -------------------------------------------------------------------------
+    // GET /responses/raw/lunatic-json/get/unprocessed
+    // -------------------------------------------------------------------------
 
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub()).isNotEmpty().hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().campaignId()).isNotNull().isEqualTo(campaignId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().questionnaireId()).isNotNull().isEqualTo(questionnaireId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().idUE()).isNotNull().isEqualTo(idUE);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().interrogationId()).isNotNull().isEqualTo(interrogationId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().mode()).isEqualTo(Mode.WEB);
+    @Nested
+    @DisplayName("GET /responses/raw/lunatic-json/get/unprocessed tests")
+    class GetUnprocessedJsonRawDataTests {
 
-        Map<String, Object> collectedVar = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("COLLECTED"));
-        Assertions.assertThat(collectedVar.get("testdata")).isNotNull();
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with unprocessed data ids")
+        void getUnprocessedJson_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.getUnprocessedDataIds()).thenReturn(List.of());
 
-        Object value = JsonUtils.asMap(collectedVar.get("testdata")).get(DataState.COLLECTED.toString());
-        Assertions.assertThat(value).isNotNull().isInstanceOf(List.class);
-        List<?> list = (List<?>) value;
-        Assertions.assertThat(list).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().recordDate()).isNotNull();
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().processDate()).isNull();
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/get/unprocessed"))
+                    .andExpect(status().isOk());
+        }
     }
 
-    @Test
-    void getUnprocessedDataTest(){
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST1";
-        String questionnaireId = "QUEST1";
-        String interrogationId = "testinterrogationId1";
-        addJsonRawDataDocumentToStub(campaignId, questionnaireId, interrogationId, null);
-
-        //WHEN
-        List<LunaticJsonRawDataUnprocessedDto> dtos = rawResponseController.getUnprocessedJsonRawData().getBody();
-
-        //THEN
-        Assertions.assertThat(dtos).isNotNull().isNotEmpty().hasSize(1);
-        Assertions.assertThat(dtos.getFirst().campaignId()).isEqualTo(campaignId);
-        Assertions.assertThat(dtos.getFirst().questionnaireId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(dtos.getFirst().interrogationId()).isEqualTo(interrogationId);
+    // -------------------------------------------------------------------------
+    // GET /responses/raw/lunatic-json/get/unprocessed/questionnaireIds
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("GET /responses/raw/lunatic-json/get/unprocessed/questionnaireIds tests")
+    class GetUnprocessedJsonRawDataQuestionnairesIdsTests {
+
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with questionnaire ids set")
+        void getUnprocessedQuestionnaireIds_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.getUnprocessedDataQuestionnaireIds())
+                    .thenReturn(Set.of("QUEST01", "QUEST02"));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/get/unprocessed/questionnaireIds"))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("QUEST01")));
+        }
     }
 
-    @Test
-    void getUnprocessedDataTest_processDate_present(){
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST2";
-        String questionnaireId = "QUEST2";
-        String interrogationId = "testinterrogationId2";
-        addJsonRawDataDocumentToStub(campaignId, questionnaireId, interrogationId, LocalDateTime.now());
+    // -------------------------------------------------------------------------
+    // POST /responses/raw/lunatic-json/process (deprecated)
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("POST /responses/raw/lunatic-json/process tests (deprecated)")
+    class ProcessJsonRawDataDeprecatedTests {
+
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with count when no formatted data")
+        void processDeprecated_noFormatted_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.processRawData(anyString(), anyList(), anyList()))
+                    .thenReturn(new DataProcessResult(5, 0, new ArrayList<>()));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/responses/raw/lunatic-json/process")
+                            .with(csrf())
+                            .param("campaignName", "CAMPAIGN")
+                            .param("questionnaireId", "QUEST01")
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("[\"i1\"]"))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("5")));
+        }
 
-        //WHEN
-        List<LunaticJsonRawDataUnprocessedDto> dtos = rawResponseController.getUnprocessedJsonRawData().getBody();
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with formatted info when formatted data present")
+        void processDeprecated_withFormatted_shouldReturnFormattedInfo() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.processRawData(anyString(), anyList(), anyList()))
+                    .thenReturn(new DataProcessResult(5, 2, new ArrayList<>()));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/responses/raw/lunatic-json/process")
+                            .with(csrf())
+                            .param("campaignName", "CAMPAIGN")
+                            .param("questionnaireId", "QUEST01")
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("[\"i1\"]"))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("FORMATTED")));
+        }
 
-        //THEN
-        Assertions.assertThat(dtos).isNotNull().isEmpty();
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return GenesisException status when port throws")
+        void processDeprecated_genesisException_shouldReturnExceptionStatus() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.processRawData(anyString(), anyList(), anyList()))
+                    .thenThrow(new GenesisException(500, "Internal error"));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/responses/raw/lunatic-json/process")
+                            .with(csrf())
+                            .param("campaignName", "CAMPAIGN")
+                            .param("questionnaireId", "QUEST01")
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .content("[\"i1\"]"))
+                    .andExpect(status().isInternalServerError());
+        }
     }
 
-    //raw data process
-    //json
-    @Test
-    void processJsonRawDataTest(){
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().clear();
-        String questionnaireId = "SAMPLETEST-PARADATA-V2";
-        String interrogationId = "testinterrogationId1";
-        String idUE = "testIdUE1";
-        String varName = "AVIS_MAIL";
-        String varValue = "TEST";
-        addJsonRawDataDocumentToStub(questionnaireId, questionnaireId, interrogationId, idUE, null, LocalDateTime.now(),varName
-                , varValue);
-
-        dataProcessingContextPersistancePortStub.getMongoStub().add(
-                DataProcessingContextMapper.INSTANCE.modelToDocument(
-                        DataProcessingContextModel.builder()
-                                .partitionId(questionnaireId)
-                                .collectionInstrumentId(questionnaireId)
-                                .kraftwerkExecutionScheduleList(new ArrayList<>())
-                                .withReview(true)
-                                .build()
-                )
-        );
-
-        //WHEN
-        ResponseEntity response = rawResponseController.processJsonRawData(questionnaireId);
-
-
-        //THEN
-        if(!response.getStatusCode().is2xxSuccessful()){
-            log.error(response.getBody().toString());
-        }
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-
-        //Genesis model survey unit created successfully
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).isNotNull().isNotEmpty().hasSize(1);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst()).isNotNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCampaignId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectionInstrumentId()).isNotNull().isEqualTo(questionnaireId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getMode()).isNotNull().isEqualTo(Mode.WEB);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getInterrogationId()).isEqualTo(interrogationId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getUsualSurveyUnitId()).isEqualTo(idUE);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getFileDate()).isNotNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getRecordDate()).isNotNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables()).isNotNull().isNotEmpty().hasSize(1);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst()).isNotNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().varId()).isNotNull().isEqualTo(varName);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().value()).isNotNull().isEqualTo(varValue);
-
-        //Process date check
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().processDate()).isNotNull();
-
-        //Perret call check
-        Assertions.assertThat(surveyUnitQualityToolPerretAdapterStub.getReceivedMaps())
-                .hasSize(1);
-        Assertions.assertThat(surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().getFirst()).containsKey(questionnaireId);
-        Assertions.assertThat(surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().getFirst().get(questionnaireId))
-                .contains(interrogationId);
-    }
+    @Nested
+    @DisplayName("POST /responses/raw/lunatic-json/{questionnaireId}/process tests")
+    class ProcessJsonRawDataByQuestionnaireIdTests {
+
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return 200 with count message")
+        void processByQuestionnaireId_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.processRawData("QUEST01"))
+                    .thenReturn(new DataProcessResult(8, 0, new ArrayList<>()));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/responses/raw/lunatic-json/QUEST01/process")
+                            .with(csrf()))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("8")));
+        }
 
-    @Test
-    void getLunaticJsonRawDataModelFromJsonBody() {
-        //GIVEN
-        String campaignId = "getLunaticJsonRawDataModelFromJsonBody";
-        String questionnaireId = campaignId + "_quest";
-        String interrogationId = "getRawResponsesFromJsonBody_id1";
-        String varName = "VARName1";
-        String varValue = "TEST";
-        Instant recordDate = Instant.parse("2025-01-01T01:00:00.000Z");
-        Instant processDate = Instant.parse("2025-01-02T01:00:00.000Z");
-
-        addJsonRawDataDocumentToStub(campaignId, questionnaireId, interrogationId, null,
-                LocalDateTime.ofInstant(processDate, ZoneOffset.UTC),
-                LocalDateTime.ofInstant(recordDate, ZoneOffset.UTC),
-                varName, varValue);
-
-        Instant starDate= recordDate.minusSeconds(86400),endDate = recordDate.plusSeconds(86400);
-        int page=0, size= 10;
-
-        //WHEN
-        ResponseEntity<PagedModel<LunaticJsonRawDataModel>> response = rawResponseController.getLunaticJsonRawDataModelFromJsonBody(campaignId, starDate, endDate, page, size);
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull();
-        Assertions.assertThat(response.getBody().getContent()).hasSize(1);
+        @Test
+        @WithMockUser(roles = "SCHEDULER")
+        @DisplayName("Should return GenesisException status when port throws")
+        void processByQuestionnaireId_genesisException_shouldReturnExceptionStatus() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.processRawData(anyString()))
+                    .thenThrow(new GenesisException(404, "Questionnaire not found"));
+
+            // WHEN / THEN
+            mockMvc.perform(post("/responses/raw/lunatic-json/QUEST01/process")
+                            .with(csrf()))
+                    .andExpect(status().isNotFound())
+                    .andExpect(content().string(containsString("Questionnaire not found")));
+        }
     }
 
-    @Test
-    void getRawResponsesFromJsonBody() {
-        //GIVEN
-        String campaignId = "VPPI2024M05";
-        String questionnaireId = campaignId + "_quest";
-        String interrogationId = "getRawResponsesFromJsonBody_id1";
-        Instant recordDate = Instant.parse("2025-01-01T01:00:00.000Z");
+    @Nested
+    @DisplayName("GET /responses/raw/lunatic-json/{campaignId} tests")
+    class GetLunaticJsonRawDataTests {
+
+        @Test
+        @WithMockUser(roles = "USER_BATCH_GENERIC")
+        @DisplayName("Should return 200 with paged model")
+        void getLunaticJson_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.findRawDataByCampaignIdAndDate(
+                    eq("CAMPAIGN"), any(), any(), any()))
+                    .thenReturn(new PageImpl<>(List.of(), PageRequest.of(0, 1000), 0));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/CAMPAIGN"))
+                    .andExpect(status().isOk());
+        }
 
-        addJsonRawResponseDataDocumentToStub(campaignId, questionnaireId, interrogationId);
+        @Test
+        @WithMockUser(roles = "USER_BATCH_GENERIC")
+        @DisplayName("Should accept optional startDate and endDate query params")
+        void getLunaticJson_withDates_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.findRawDataByCampaignIdAndDate(
+                    anyString(), any(Instant.class), any(Instant.class), any()))
+                    .thenReturn(new PageImpl<>(List.of()));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/CAMPAIGN")
+                            .param("startDate", "2024-01-01T00:00:00Z")
+                            .param("endDate", "2024-12-31T23:59:59Z"))
+                    .andExpect(status().isOk());
+        }
 
-        Instant starDate= recordDate.minusSeconds(86400),endDate = recordDate.plusSeconds(86400);
-        int page=0, size= 10;
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have USER_BATCH_GENERIC role")
+        void getLunaticJson_wrongRole_shouldReturn403() throws Exception {
+            // GIVEN
 
-        //WHEN
-        ResponseEntity<PagedModel<RawResponseModel>> response = rawResponseController.getRawResponsesFromJsonBody(campaignId, starDate, endDate, page, size);
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/CAMPAIGN"))
+                    .andExpect(status().isForbidden());
+        }
+    }
 
-        //THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        org.junit.jupiter.api.Assertions.assertNotNull(response.getBody());
-        Assertions.assertThat(response.getBody().getContent()).hasSize(1);
+    @Nested
+    @DisplayName("GET /responses/raw/lunatic-json/by-questionnaire/{questionnaireId} tests")
+    class GetLunaticJsonByQuestionnaireTests {
+
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should return 200 with paged model")
+        void getByQuestionnaire_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.findRawDataByQuestionnaireId(eq("QUEST01"), any()))
+                    .thenReturn(new PageImpl<>(List.of()));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/by-questionnaire/QUEST01"))
+                    .andExpect(status().isOk());
+        }
     }
 
-    @Test
-    void existsRawResponseInterrogation_shouldReturn404_whenNotExists() {
-        // Given
-        String unknownId = "UNKNOWN_INTERROGATION_ID";
+    @Nested
+    @DisplayName("HEAD /responses/raw/lunatic-json/{interrogationId} tests")
+    class ExistsLunaticJsonByInterrogationIdTests {
 
-        // When
-        ResponseEntity<Void> response = rawResponseController.exists(unknownId);
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should return 200 when interrogation exists")
+        void existsLunaticJson_exists_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.existsByInterrogationId("INTERRO01")).thenReturn(true);
 
-        // Then
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(404);
-        Assertions.assertThat(response.getBody()).isNull();
-    }
+            // WHEN / THEN
+            mockMvc.perform(request(HEAD, "/responses/raw/lunatic-json/INTERRO01"))
+                    .andExpect(status().isOk());
+        }
 
-    @Test
-    void existsRawResponseInterrogation_shouldReturn200_whenExists() {
-        // When
-        ResponseEntity<Void> response = rawResponseController.exists(DEFAULT_INTERROGATION_ID);
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should return 404 when interrogation does not exist")
+        void existsLunaticJson_notFound_shouldReturn404() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.existsByInterrogationId("INTERRO01")).thenReturn(false);
 
-        // Then
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNull();
-    }
+            // WHEN / THEN
+            mockMvc.perform(request(HEAD, "/responses/raw/lunatic-json/INTERRO01"))
+                    .andExpect(status().isNotFound());
+        }
 
-    @Test
-    void existsLunaticJsonInterrogation_shouldReturn200_whenExists() {
-        // When
-        ResponseEntity<Void> response = rawResponseController.existsLunaticJsonByInterrogationId(DEFAULT_INTERROGATION_ID);
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have ADMIN role")
+        void existsLunaticJson_wrongRole_shouldReturn403() throws Exception {
+            // GIVEN
 
-        // Then
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNull();
+            // WHEN / THEN
+            mockMvc.perform(request(HEAD, "/responses/raw/lunatic-json/INTERRO01"))
+                    .andExpect(status().isForbidden());
+        }
     }
 
-    @Test
-    void existsLunaticJsonInterrogation_shouldReturn404_whenNotExists() {
-        // Given
-        String unknownId = "UNKNOWN_INTERROGATION_ID";
+    @Nested
+    @DisplayName("GET /raw-responses/{campaignId} tests")
+    class GetRawResponsesByCampaignTests {
+
+        @Test
+        @WithMockUser(roles = "USER_BATCH_GENERIC")
+        @DisplayName("Should return 200 with paged model")
+        void getRawResponses_shouldReturn200() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.findRawResponseDataByCampaignIdAndDate(
+                    eq("CAMPAIGN"), any(), any(), any()))
+                    .thenReturn(new PageImpl<>(List.of(), PageRequest.of(0, 1000), 0));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/raw-responses/CAMPAIGN"))
+                    .andExpect(status().isOk());
+        }
 
-        // When
-        ResponseEntity<Void> response = rawResponseController.existsLunaticJsonByInterrogationId(unknownId);
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have USER_BATCH_GENERIC role")
+        void getRawResponses_wrongRole_shouldReturn403() throws Exception {
+            // GIVEN
 
-        // Then
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(404);
-        Assertions.assertThat(response.getBody()).isNull();
+            // WHEN / THEN
+            mockMvc.perform(get("/raw-responses/CAMPAIGN"))
+                    .andExpect(status().isForbidden());
+        }
     }
 
-    //Utils
-    private void addJsonRawDataDocumentToStub(String campaignId, String questionnaireId, String interrogationId,
-                                                     LocalDateTime processDate) {
-        LunaticJsonRawDataDocument lunaticJsonDataDocument = LunaticJsonRawDataDocument.builder()
-                .campaignId(campaignId)
-                .mode(Mode.WEB)
-                .interrogationId(interrogationId)
-                .questionnaireId(questionnaireId)
-                .recordDate(LocalDateTime.now())
-                .processDate(processDate)
-                .build();
-
-        lunaticJsonRawDataPersistanceStub.getMongoStub().add(lunaticJsonDataDocument);
-    }
+    @Nested
+    @DisplayName("GET /raw-responses/by-collection-instrument/{collectionInstrumentId} tests")
+    class GetRawResponsesByCollectionInstrumentTests {
+
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should return 200 with paged model")
+        void getByCollectionInstrument_shouldReturn200() throws Exception {
+            // GIVEN
+            // All nulls as we only test status
+            RawResponseModel rawResponseModel = new RawResponseModel(
+                    null, null, null, null, null, null, null
+            );
+
+            when(rawResponseApiPort.findRawResponseDataByCollectionInstrumentId(eq("QUEST01"), any()))
+                    .thenReturn(new PageImpl<>(List.of(rawResponseModel), PageRequest.of(0, 1000), 1));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/raw-responses/by-collection-instrument/QUEST01"))
+                    .andExpect(status().isOk());
+        }
 
-    private void addJsonRawDataDocumentToStub(String campaignId,
-                                              String questionnaireId,
-                                              String interrogationId,
-                                              String idUE,
-                                              LocalDateTime processDate,
-                                              LocalDateTime recordDate,
-                                              String variableName,
-                                              String variableValue)
-    {
-        Map<String, Object> jsonMap = Map.of(
-                "COLLECTED", Map.of(variableName, Map.of("COLLECTED", variableValue)),
-                "EXTERNAL", Map.of(variableName + "_EXTERNAL", variableValue + "_EXTERNAL")
-        );
-
-        LunaticJsonRawDataDocument lunaticJsonDataDocument = LunaticJsonRawDataDocument.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .mode(Mode.WEB)
-                .interrogationId(interrogationId)
-                .idUE(idUE)
-                .recordDate(recordDate)
-                .processDate(processDate)
-                .data(jsonMap)
-                .build();
-
-        lunaticJsonRawDataPersistanceStub.getMongoStub().add(lunaticJsonDataDocument);
+        @Test
+        @WithMockUser(roles = "USER")
+        @DisplayName("Should return 403 when user does not have ADMIN role")
+        void getByCollectionInstrument_wrongRole_shouldReturn403() throws Exception {
+            // WHEN / THEN
+            mockMvc.perform(get("/raw-responses/by-collection-instrument/QUEST01"))
+                    .andExpect(status().isForbidden());
+        }
     }
 
-    private void addJsonRawResponseDataDocumentToStub(String campaignId, String questionnaireId, String interrogationId) {
-        RawResponseDocument rawResponseDocument = RawResponseDocument.builder()
-                .collectionInstrumentId(questionnaireId)
-                .interrogationId(interrogationId)
-                .recordDate(LocalDateTime.now())
-                .payload(Map.of("campaignId", campaignId))
-                .build();
+    @Nested
+    @DisplayName("HEAD /raw-responses/{interrogationId} tests")
+    class ExistsByInterrogationIdTests {
 
-        rawResponseDataPersistanceStub.getMongoStub().add(rawResponseDocument);
-    }
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should return 200 when interrogation exists")
+        void exists_found_shouldReturn200() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.existsByInterrogationId("INTERRO01")).thenReturn(true);
+
+            // WHEN / THEN
+            mockMvc.perform(request(HEAD, "/raw-responses/INTERRO01"))
+                    .andExpect(status().isOk());
+        }
+
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should return 404 when interrogation does not exist")
+        void exists_notFound_shouldReturn404() throws Exception {
+            // GIVEN
+            when(rawResponseApiPort.existsByInterrogationId("INTERRO01")).thenReturn(false);
 
-    @Test
-    void getRawResponsesFromJsonBody_filterByCampaignId() {
-        // GIVEN
-        rawResponseDataPersistanceStub.getMongoStub().clear();
-
-        String campaignId = "CAMPAIGN_OK";
-        String questionnaireId = campaignId + "_QUEST";
-        String interrogationId1 = "INT_1";
-        String interrogationId2 = "INT_2";
-
-        // document with the wanted campaignId
-        RawResponseDocument rawResponseDocument = RawResponseDocument.builder()
-                .collectionInstrumentId(questionnaireId)
-                .interrogationId(interrogationId1)
-                .recordDate(LocalDateTime.now())
-                .payload(Map.of("campaignId", campaignId))
-                .build();
-
-        // document with another campaignId
-        RawResponseDocument rawResponseDocument1 = RawResponseDocument.builder()
-                .collectionInstrumentId("OTHER_QUEST")
-                .interrogationId(interrogationId2)
-                .recordDate(LocalDateTime.now())
-                .payload(Map.of("campaignId", "OTHER_CAMPAIGN"))
-                .build();
-
-        rawResponseDataPersistanceStub.getMongoStub().addAll(List.of(rawResponseDocument, rawResponseDocument1));
-
-        Instant startDate = Instant.now().minusSeconds(3600);
-        Instant endDate = Instant.now().plusSeconds(3600);
-
-        // WHEN
-        ResponseEntity<PagedModel<RawResponseModel>> response =
-                rawResponseController.getRawResponsesFromJsonBody(
-                        campaignId,
-                        startDate,
-                        endDate,
-                        0,
-                        10
-                );
-
-        // THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull();
-        Assertions.assertThat(response.getBody().getContent()).hasSize(1);
-
-        RawResponseModel result = response.getBody().getContent().getFirst();
-        Assertions.assertThat(result.interrogationId()).isEqualTo(interrogationId1);
-        Assertions.assertThat(result.payload().get("campaignId")).isEqualTo(campaignId);
+            // WHEN / THEN
+            mockMvc.perform(request(HEAD, "/raw-responses/INTERRO01"))
+                    .andExpect(status().isNotFound());
+        }
     }
 
-}
+    // -------------------------------------------------------------------------
+    // GET /responses/raw/lunatic-json/processed/ids
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("GET /responses/raw/lunatic-json/processed/ids tests")
+    class GetProcessedDataIdsSinceHoursTests {
+
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should return 200 with processed ids map")
+        void getProcessedIds_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.findProcessedIdsgroupedByQuestionnaireSince(any()))
+                    .thenReturn(Map.of("QUEST01", List.of("i1", "i2")));
+
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/processed/ids")
+                            .param("questionnaireId", "QUEST01"))
+                    .andExpect(status().isOk())
+                    .andExpect(content().string(containsString("QUEST01")));
+        }
+
+        @Test
+        @WithMockUser(roles = "ADMIN")
+        @DisplayName("Should use default sinceHours=24 when not specified")
+        void getProcessedIds_defaultHours_shouldReturn200() throws Exception {
+            // GIVEN
+            when(lunaticJsonRawDataApiPort.findProcessedIdsgroupedByQuestionnaireSince(any()))
+                    .thenReturn(Map.of());
+
+            // WHEN / THEN
+            mockMvc.perform(get("/responses/raw/lunatic-json/processed/ids")
+                            .param("questionnaireId", "QUEST01"))
+                    .andExpect(status().isOk());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerUnitTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerUnitTest.java
deleted file mode 100644
index 9d23152e..00000000
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerUnitTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package fr.insee.genesis.controller.rest.responses;
-
-import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
-import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
-import fr.insee.genesis.infrastructure.repository.RawResponseInputRepository;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.ResponseEntity;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
-class RawResponseControllerUnitTest {
-
-    static RawResponseController rawResponseController;
-    static LunaticJsonRawDataApiPort lunaticJsonRawDataStub;
-
-    @BeforeEach
-    void init(){
-        lunaticJsonRawDataStub = mock(LunaticJsonRawDataApiPort.class);
-        rawResponseController = new RawResponseController(
-            lunaticJsonRawDataStub,
-                mock(RawResponseApiPort.class),
-                mock(RawResponseInputRepository.class)
-        );
-    }
-
-
-    @Test
-    void getUnprocessedJsonRawDataQuestionnairesIds_test(){
-        // GIVEN
-        Set<String> questionnaireIds = new HashSet<>();
-        questionnaireIds.add("QUEST1");
-        questionnaireIds.add("QUEST2");
-        doReturn(questionnaireIds).when(lunaticJsonRawDataStub).getUnprocessedDataQuestionnaireIds();
-
-        // WHEN
-        ResponseEntity<Set<String>> response = rawResponseController.getUnprocessedJsonRawDataQuestionnairesIds();
-
-        // THEN
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().containsExactlyInAnyOrder("QUEST1","QUEST2");
-    }
-
-}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java
deleted file mode 100644
index 977bccf4..00000000
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java
+++ /dev/null
@@ -1,781 +0,0 @@
-package fr.insee.genesis.controller.rest.responses;
-
-
-import fr.insee.genesis.Constants;
-import fr.insee.genesis.TestConstants;
-import fr.insee.genesis.configuration.Config;
-import fr.insee.genesis.controller.dto.SurveyUnitInputDto;
-import fr.insee.genesis.controller.dto.SurveyUnitQualityToolDto;
-import fr.insee.genesis.controller.dto.SurveyUnitSimplifiedDto;
-import fr.insee.genesis.controller.dto.VariableInputDto;
-import fr.insee.genesis.controller.dto.VariableQualityToolDto;
-import fr.insee.genesis.controller.dto.VariableStateInputDto;
-import fr.insee.genesis.controller.utils.AuthUtils;
-import fr.insee.genesis.controller.utils.ControllerUtils;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.domain.service.context.DataProcessingContextService;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.exceptions.GenesisException;
-import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.ResponseEntity;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.time.Month;
-import java.util.ArrayList;
-import java.util.List;
-
-import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_SURVEY_UNIT_ID;
-
-class ResponseControllerTest {
-    //Given
-    static ResponseController responseControllerStatic;
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-    static DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub;
-    static QuestionnaireMetadataPersistencePortStub questionnaireMetadataPersistencePortStub;
-
-    static List<InterrogationId> interrogationIdList;
-    //Constants
-
-    @BeforeAll
-    static void init() {
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-
-        dataProcessingContextPersistancePortStub = new DataProcessingContextPersistancePortStub();
-        questionnaireMetadataPersistencePortStub = new QuestionnaireMetadataPersistencePortStub();
-
-        Config config = new ConfigStub();
-        FileUtils fileUtils = new FileUtils(config);
-        SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
-                surveyUnitPersistencePortStub,
-                new QuestionnaireMetadataService(questionnaireMetadataPersistencePortStub),
-                fileUtils
-                );
-
-        responseControllerStatic = new ResponseController(
-                surveyUnitApiPort
-                , new SurveyUnitQualityService()
-                , fileUtils
-                , new ControllerUtils(fileUtils)
-                , new AuthUtils(config)
-                , new QuestionnaireMetadataService(questionnaireMetadataPersistencePortStub)
-                , new DataProcessingContextService(dataProcessingContextPersistancePortStub, surveyUnitPersistencePortStub)
-        );
-
-        interrogationIdList = new ArrayList<>();
-        interrogationIdList.add(new InterrogationId(DEFAULT_INTERROGATION_ID));
-    }
-
-    @BeforeEach
-    void reset() throws IOException {
-        dataProcessingContextPersistancePortStub.getMongoStub().clear();
-
-        Utils.reset(surveyUnitPersistencePortStub);
-    }
-
-
-    //When + Then
-
-    //Survey units
-    @Test
-    void saveResponseFromXMLFileTest() throws Exception {
-        responseControllerStatic.saveResponsesFromXmlFile(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "IN/WEB/SAMPLETEST-PARADATA-V1/reponse-platine/data.complete.validated.STPDv1.20231122164209.xml").toString()
-                , Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "specs/SAMPLETEST-PARADATA-V1/ddi-SAMPLETEST-PARADATA-V1.xml").toString()
-                , Mode.WEB
-        );
-
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).isNotEmpty();
-    }
-
-    @Test
-    void saveOneFileNoCollected_NoNullPointerException(){
-        Assertions.assertThatCode(() -> responseControllerStatic.saveResponsesFromXmlFile(
-                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "IN/WEB/SAMPLETEST-NO-COLLECTED/differential/data/data_diff_no_collected.xml").toString()
-                , Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "specs/SAMPLETEST-NO-COLLECTED/WEB/ddi_response_simple.xml").toString()
-                , Mode.WEB
-        )).doesNotThrowAnyException();
-
-    }
-
-    @Test
-    void saveResponsesFromXmlCampaignFolderTest() throws Exception {
-        responseControllerStatic.saveResponsesFromXmlCampaignFolder(
-                "SAMPLETEST-PARADATA-V1"
-                , Mode.WEB
-        );
-
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).isNotEmpty();
-    }
-
-    @Test
-    void saveResponsesFromXmlCampaignFolderTest_noData() throws Exception {
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-
-        responseControllerStatic.saveResponsesFromXmlCampaignFolder(
-                "TESTNODATA"
-                , Mode.WEB
-        );
-
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).isEmpty();
-    }
-    //All data
-    @Test
-    void saveResponsesFromAllCampaignFoldersTests(){
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        responseControllerStatic.saveResponsesFromAllCampaignFolders();
-
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).isNotEmpty();
-    }
-
-
-    //Gets
-    @Test
-    void findResponsesByUEAndQuestionnaireTest() {
-        ResponseEntity<List<SurveyUnitModel>> response = responseControllerStatic.findResponsesByInterrogationAndCollectionInstrument(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID);
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
-        Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-        Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
-        Assertions.assertThat(response.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(DEFAULT_COLLECTION_INSTRUMENT_ID);
-    }
-
-    @Test
-    void findResponsesByUsualSurveyUnitAndQuestionnaireTest() {
-        ResponseEntity<List<SurveyUnitModel>> response = responseControllerStatic.findResponsesByUsualSurveyUnitAndCollectionInstrument(DEFAULT_SURVEY_UNIT_ID, DEFAULT_COLLECTION_INSTRUMENT_ID);
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
-        Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-        Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
-        Assertions.assertThat(response.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(DEFAULT_COLLECTION_INSTRUMENT_ID);
-    }
-
-    @Test
-    void getLatestByUETest() {
-        Utils.addAdditionalSurveyUnitModelToMongoStub(surveyUnitPersistencePortStub);
-
-        ResponseEntity<List<SurveyUnitModel>> response = responseControllerStatic.getLatestByInterrogationAndCollectionInstrument(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID);
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
-        Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-        Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
-        Assertions.assertThat(response.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(DEFAULT_COLLECTION_INSTRUMENT_ID);
-        Assertions.assertThat(response.getBody().getFirst().getFileDate()).hasMonth(Month.FEBRUARY);
-    }
-
-    @Test
-    void getLatestByUEOneObjectTest() {
-        ResponseEntity<SurveyUnitSimplifiedDto> response = responseControllerStatic.getLatestByInterrogationOneObject(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID, Mode.WEB);
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull();
-        Assertions.assertThat(response.getBody().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-        Assertions.assertThat(response.getBody().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
-        Assertions.assertThat(response.getBody().getCollectionInstrumentId()).isEqualTo(DEFAULT_COLLECTION_INSTRUMENT_ID);
-    }
-
-    @Test
-    void getLatestForUEListTest() {
-        ResponseEntity<List<SurveyUnitSimplifiedDto>> response = responseControllerStatic.getLatestForInterrogationListAndCollectionInstrument(DEFAULT_COLLECTION_INSTRUMENT_ID, interrogationIdList);
-
-        Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
-        Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
-        Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-        Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
-    }
-
-    // Perret tests
-    @Test
-    void getLatestByStatesSurveyDataTest() throws GenesisException {
-        //GIVEN
-        //Recent Collected already in stub
-        //Old Collected
-        Utils.addAdditionalSurveyUnitModelToMongoStub(DataState.COLLECTED,
-                "C OLD C", //<Collected/External> <NEW or OLD> <Collected/Edited>
-                "E OLD C",
-                LocalDateTime.of(1999,2,2,0,0,0),
-                LocalDateTime.of(1999,2,2,0,0,0),
-                surveyUnitPersistencePortStub
-        );
-
-        //Recent Edited
-        Utils.addAdditionalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C NEW E",
-                "E NEW E",
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0),
-                surveyUnitPersistencePortStub
-        );
-
-        //Old Edited
-        Utils.addAdditionalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C OLD E",
-                "E OLD E",
-                LocalDateTime.of(1999,2,2,0,0,0),
-                LocalDateTime.of(1999,2,2,0,0,0),
-                surveyUnitPersistencePortStub
-        );
-
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setPartitionId("TEST-TABLEAUX");
-        doc.setCollectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID);
-        doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc.setWithReview(true);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
-
-
-        //WHEN
-        ResponseEntity<Object> response = responseControllerStatic.findResponsesByInterrogationAndCollectionInstrumentLatestStates(
-                DEFAULT_INTERROGATION_ID,
-                DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
-
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(200);
-        SurveyUnitQualityToolDto surveyUnitQualityToolDto = (SurveyUnitQualityToolDto) response.getBody();
-
-        Assertions.assertThat(surveyUnitQualityToolDto).isNotNull();
-
-        Assertions.assertThat(surveyUnitQualityToolDto.getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-
-        List<VariableQualityToolDto> variableQualityToolDtos = surveyUnitQualityToolDto.getCollectedVariables().stream().filter(
-                variableQualityToolDto -> variableQualityToolDto.getVariableName().equals("TESTVARID")
-                && variableQualityToolDto.getIteration().equals(1)
-        ).toList();
-        Assertions.assertThat(variableQualityToolDtos).hasSize(1);
-        VariableQualityToolDto variableQualityToolDto = variableQualityToolDtos.getFirst();
-
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("C NEW E");
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().isActive())
-                .isFalse();
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().isActive())
-                .isTrue();
-
-
-        variableQualityToolDtos = surveyUnitQualityToolDto.getExternalVariables().stream().filter(
-                variableQualityToolDto1 -> variableQualityToolDto1.getVariableName().equals("TESTVARID")
-                        && variableQualityToolDto1.getIteration().equals(1)
-        ).toList();
-        Assertions.assertThat(variableQualityToolDtos).hasSize(1);
-        variableQualityToolDto = variableQualityToolDtos.getFirst();
-
-        Assertions.assertThat(variableQualityToolDto.getVariableName())
-                .isEqualTo("TESTVARID");
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("E NEW E");
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().isActive())
-                .isFalse();
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().isActive())
-                .isTrue();
-    }
-
-    @Test
-    void getLatestByStatesSurveyDataTest_invalid_collected() throws GenesisException {
-        //GIVEN
-        String variableName = "TABLEAUTIC21"; //Number variable
-        Utils.addAdditionalSurveyUnitModelToMongoStub(DataState.COLLECTED,
-                variableName,
-                "?",
-                "?",
-                LocalDateTime.of(1999,2,2,0,0,0),
-                LocalDateTime.of(1999,2,2,0,0,0),
-                surveyUnitPersistencePortStub
-        );
-
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setPartitionId("TEST-TABLEAUX");
-        doc.setCollectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID);
-        doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
-        doc.setWithReview(true);
-        dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
-
-
-        //WHEN
-        ResponseEntity<Object> response = responseControllerStatic.findResponsesByInterrogationAndCollectionInstrumentLatestStates(
-                DEFAULT_INTERROGATION_ID,
-                DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
-
-
-        //THEN
-        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(200);
-        SurveyUnitQualityToolDto surveyUnitQualityToolDto = (SurveyUnitQualityToolDto) response.getBody();
-
-        Assertions.assertThat(surveyUnitQualityToolDto).isNotNull();
-
-        Assertions.assertThat(surveyUnitQualityToolDto.getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-
-        List<VariableQualityToolDto> variableQualityToolDtos = surveyUnitQualityToolDto.getCollectedVariables().stream().filter(
-                variableQualityToolDto -> variableQualityToolDto.getVariableName().equals(variableName)
-                        && variableQualityToolDto.getIteration().equals(1)
-        ).toList();
-        Assertions.assertThat(variableQualityToolDtos).hasSize(1);
-        VariableQualityToolDto variableQualityToolDto = variableQualityToolDtos.getFirst();
-
-        Assertions.assertThat(variableQualityToolDto.getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("?");
-    }
-
-    @Test
-    void saveEditedTest() {
-        //GIVEN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String questionnaireId = DEFAULT_COLLECTION_INSTRUMENT_ID;
-        String varId = "PRENOM_C";
-        String loopId = "B_PRENOMREP";
-        String editedValue = "TESTPRENOMEDITED";
-
-        List<VariableInputDto> newVariables = new ArrayList<>();
-        VariableInputDto variableInputDto = VariableInputDto.builder()
-                .variableName(varId)
-                .iteration(1)
-                .build();
-
-        variableInputDto.setVariableStateInputDto(VariableStateInputDto.builder()
-                        .state(DataState.EDITED)
-                        .value(editedValue)
-                .build());
-
-        newVariables.add(variableInputDto);
-
-        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
-                .mode(Mode.WEB)
-                .questionnaireId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(newVariables)
-                .build();
-
-        // We need a response in database to retrieve campaignId from interrogationId and questionnaireId
-        SurveyUnitModel suModel = SurveyUnitModel.builder()
-                .state(DataState.COLLECTED)
-                .mode(Mode.WEB)
-                .collectionInstrumentId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(List.of())
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(suModel);
-
-        //WHEN
-        responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
-
-        //THEN
-        SurveyUnitModel docSaved = surveyUnitPersistencePortStub.getMongoStub().get(1);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
-        Assertions.assertThat(docSaved.getCollectionInstrumentId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(docSaved.getMode()).isEqualTo(Mode.WEB);
-        Assertions.assertThat(docSaved.getState()).isEqualTo(DataState.EDITED);
-        Assertions.assertThat(docSaved.getFileDate()).isNull();
-        Assertions.assertThat(docSaved.getRecordDate()).isNotNull();
-        Assertions.assertThat(docSaved.getExternalVariables()).isEmpty();
-
-        Assertions.assertThat(docSaved.getCollectedVariables()).hasSize(1);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().varId()).isEqualTo(varId);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().value()).isEqualTo(editedValue);
-
-        Assertions.assertThat(docSaved.getModifiedBy()).isNull();
-    }
-
-    @Test
-    void saveEditedTest_DocumentEdited() {
-        //GIVEN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String questionnaireId = DEFAULT_COLLECTION_INSTRUMENT_ID;
-        String varId = "PRENOM_C";
-        String varId2 = "NB_SOEURS";
-        String loopId = "B_PRENOMREP";
-        String editedValue = "NOT A INT";
-
-        //Variable 1
-        List<VariableInputDto> newVariables = new ArrayList<>();
-        VariableInputDto variableInputDto = VariableInputDto.builder()
-                .variableName(varId)
-                .iteration(1)
-                .variableStateInputDto(VariableStateInputDto.builder()
-                        .state(DataState.EDITED)
-                        .value(editedValue)
-                        .build())
-                .build();
-        newVariables.add(variableInputDto);
-
-        //Variable 2
-        VariableInputDto variableInputDto2 = VariableInputDto.builder()
-                .variableName(varId2)
-                .iteration(1)
-                .variableStateInputDto(VariableStateInputDto.builder()
-                        .state(DataState.EDITED)
-                        .value(editedValue)
-                        .build())
-                .build();
-        newVariables.add(variableInputDto2);
-
-        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
-                .mode(Mode.WEB)
-                .questionnaireId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(newVariables)
-                .build();
-
-        SurveyUnitModel suModel = SurveyUnitModel.builder()
-                .state(DataState.COLLECTED)
-                .mode(Mode.WEB)
-                .collectionInstrumentId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(List.of())
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(suModel);
-
-        //WHEN
-        responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
-
-        //THEN
-        //EDITED document assertions
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(3);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectionInstrumentId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getState()).isEqualTo(DataState.EDITED);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getMode()).isEqualTo(Mode.WEB);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getFileDate()).isNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getRecordDate()).isNotNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getExternalVariables()).isEmpty();
-
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables()).hasSize(2);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().varId()).isEqualTo(varId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().value()).isEqualTo(editedValue);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getModifiedBy()).isNull();
-    }
-
-    @Test
-    void saveEditedTest_DocumentFormatted() {
-        //GIVEN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String questionnaireId = DEFAULT_COLLECTION_INSTRUMENT_ID;
-        String varId = "PRENOM_C";
-        String varId2 = "NB_SOEURS";
-        String loopId = "B_PRENOMREP";
-        String editedValue = "NOT A INT";
-
-        //Variable 1
-        List<VariableInputDto> newVariables = new ArrayList<>();
-        VariableInputDto variableInputDto = VariableInputDto.builder()
-                .variableName(varId)
-                .iteration(1)
-                .variableStateInputDto(VariableStateInputDto.builder()
-                        .state(DataState.EDITED)
-                        .value(editedValue)
-                        .build())
-                .build();
-        newVariables.add(variableInputDto);
-
-        //Variable 2
-        VariableInputDto variableInputDto2 = VariableInputDto.builder()
-                .variableName(varId2)
-                .iteration(1)
-                .variableStateInputDto(VariableStateInputDto.builder()
-                        .state(DataState.EDITED)
-                        .value(editedValue)
-                        .build())
-                .build();
-        newVariables.add(variableInputDto2);
-
-        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
-                .mode(Mode.WEB)
-                .questionnaireId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(newVariables)
-                .build();
-
-        // We need a response in database to retrieve campaignId from interrogationId and questionnaireId
-        SurveyUnitModel suModel = SurveyUnitModel.builder()
-                .state(DataState.COLLECTED)
-                .mode(Mode.WEB)
-                .collectionInstrumentId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(List.of())
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(suModel);
-
-        //WHEN
-        responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
-
-        //THEN
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(3);
-
-        //FORMATTED document assertions
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getCollectionInstrumentId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getState()).isEqualTo(DataState.FORMATTED);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getMode()).isEqualTo(Mode.WEB);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getFileDate()).isNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getRecordDate()).isNotNull();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getExternalVariables()).isEmpty();
-
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getCollectedVariables()).hasSize(1);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getCollectedVariables().getFirst().varId()).isEqualTo(varId2);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getCollectedVariables().getFirst().value()).isNotNull().isEmpty();
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getModifiedBy()).isNull();
-    }
-    @Test
-    void saveEditedTest_No_Metadata_Error() {
-        //GIVEN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String campaignId = "TEST";
-        String varId = "PRENOM_C";
-        String editedValue = "TESTVALUE";
-
-        //Variable 1
-        List<VariableInputDto> newVariables = new ArrayList<>();
-        VariableInputDto variableInputDto = VariableInputDto.builder()
-                .variableName(varId)
-                .iteration(1)
-                .variableStateInputDto(VariableStateInputDto.builder()
-                        .state(DataState.EDITED)
-                        .value(editedValue)
-                        .build())
-                .build();
-        newVariables.add(variableInputDto);
-
-        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
-                .campaignId(campaignId)
-                .mode(Mode.WEB)
-                .questionnaireId(campaignId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(newVariables)
-                .build();
-
-        // We need a response in database to retrieve campaignId from interrogationId and questionnaireId
-        SurveyUnitModel suModel = SurveyUnitModel.builder()
-                .state(DataState.COLLECTED)
-                .mode(Mode.WEB)
-                .collectionInstrumentId(campaignId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(List.of())
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(suModel);
-
-        ResponseEntity<Object> response =  responseControllerStatic.saveEditedVariables(
-                surveyUnitInputDto);
-        Assertions.assertThat(
-           response.getStatusCode()
-        ).isEqualTo(HttpStatusCode.valueOf(404));
-    }
-
-    @Test
-    void saveTest_With_Collected_State_Error(){
-        //GIVEN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String varId = "PRENOM_C";
-        String editedValue = "TESTVALUE";
-
-        //Variable 1
-        List<VariableInputDto> newVariables = new ArrayList<>();
-        VariableInputDto variableInputDto = VariableInputDto.builder()
-                .variableName(varId)
-                .variableStateInputDto(VariableStateInputDto.builder()
-                        .state(DataState.COLLECTED) //Collected instead of EDITED
-                        .value(editedValue)
-                        .build())
-                .iteration(1)
-                .build();
-        newVariables.add(variableInputDto);
-
-        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
-                .mode(Mode.WEB)
-                .questionnaireId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(newVariables)
-                .build();
-
-        // We need a response in database to retrieve campaignId from interrogationId and questionnaireId
-        SurveyUnitModel suModel = SurveyUnitModel.builder()
-                .state(DataState.COLLECTED)
-                .mode(Mode.WEB)
-                .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(List.of())
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(suModel);
-
-        Assertions.assertThat(responseControllerStatic.saveEditedVariables(surveyUnitInputDto).getStatusCode()).isEqualTo(HttpStatusCode.valueOf(400));
-    }
-
-    @Test
-    void saveEditedTest_int() {
-        //GIVEN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String questionnaireId = DEFAULT_COLLECTION_INSTRUMENT_ID;
-        String varId = "AGE";
-        String loopId = "B_PRENOMREP";
-        Integer editedValue = 5;
-
-        List<VariableInputDto> newVariables = new ArrayList<>();
-        VariableInputDto variableInputDto = VariableInputDto.builder()
-                .variableName(varId)
-                .iteration(1)
-                .build();
-
-        variableInputDto.setVariableStateInputDto(VariableStateInputDto.builder()
-                .state(DataState.EDITED)
-                .value(editedValue)
-                .build());
-
-        newVariables.add(variableInputDto);
-
-        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
-                .mode(Mode.WEB)
-                .questionnaireId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(newVariables)
-                .build();
-
-        // We need a response in database to retrieve campaignId from interrogationId and questionnaireId
-        SurveyUnitModel suModel = SurveyUnitModel.builder()
-                .state(DataState.COLLECTED)
-                .mode(Mode.WEB)
-                .collectionInstrumentId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(List.of())
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(suModel);
-
-        //WHEN
-        responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
-
-        //THEN
-        SurveyUnitModel docSaved = surveyUnitPersistencePortStub.getMongoStub().get(1);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
-        Assertions.assertThat(docSaved.getCollectionInstrumentId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(docSaved.getMode()).isEqualTo(Mode.WEB);
-        Assertions.assertThat(docSaved.getState()).isEqualTo(DataState.EDITED);
-        Assertions.assertThat(docSaved.getFileDate()).isNull();
-        Assertions.assertThat(docSaved.getRecordDate()).isNotNull();
-        Assertions.assertThat(docSaved.getExternalVariables()).isEmpty();
-
-        Assertions.assertThat(docSaved.getCollectedVariables()).hasSize(1);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().varId()).isEqualTo(varId);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().value()).isEqualTo(editedValue.toString());
-
-        Assertions.assertThat(docSaved.getModifiedBy()).isNull();
-    }
-
-    @Test
-    void saveEditedTest_null() {
-        //GIVEN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String questionnaireId = DEFAULT_COLLECTION_INSTRUMENT_ID;
-        String varId = "AGE";
-        String loopId = "B_PRENOMREP";
-        Integer editedValue = null;
-
-        List<VariableInputDto> newVariables = new ArrayList<>();
-        VariableInputDto variableInputDto = VariableInputDto.builder()
-                .variableName(varId)
-                .iteration(1)
-                .build();
-
-        variableInputDto.setVariableStateInputDto(VariableStateInputDto.builder()
-                .state(DataState.EDITED)
-                .value(editedValue)
-                .build());
-
-        newVariables.add(variableInputDto);
-
-        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
-                .mode(Mode.WEB)
-                .questionnaireId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(newVariables)
-                .build();
-
-        // We need a response in database to retrieve campaignId from interrogationId and questionnaireId
-        SurveyUnitModel suModel = SurveyUnitModel.builder()
-                .state(DataState.COLLECTED)
-                .mode(Mode.WEB)
-                .collectionInstrumentId(questionnaireId)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectedVariables(List.of())
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(suModel);
-
-        //WHEN
-        responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
-
-        //THEN
-        SurveyUnitModel docSaved = surveyUnitPersistencePortStub.getMongoStub().get(1);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
-        Assertions.assertThat(docSaved.getCollectionInstrumentId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(docSaved.getMode()).isEqualTo(Mode.WEB);
-        Assertions.assertThat(docSaved.getState()).isEqualTo(DataState.EDITED);
-        Assertions.assertThat(docSaved.getFileDate()).isNull();
-        Assertions.assertThat(docSaved.getRecordDate()).isNotNull();
-        Assertions.assertThat(docSaved.getExternalVariables()).isEmpty();
-
-        Assertions.assertThat(docSaved.getCollectedVariables()).hasSize(1);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().varId()).isEqualTo(varId);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
-        Assertions.assertThat(docSaved.getCollectedVariables().getFirst().value()).isNull();
-
-        Assertions.assertThat(docSaved.getModifiedBy()).isNull();
-    }
-}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerUnitTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerUnitTest.java
index fb1153ab..f667d876 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerUnitTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerUnitTest.java
@@ -1,10 +1,15 @@
 package fr.insee.genesis.controller.rest.responses;
 
+import fr.insee.bpm.metadata.model.MetadataModel;
 import fr.insee.genesis.Constants;
 import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.controller.dto.SurveyUnitDto;
+import fr.insee.genesis.controller.dto.SurveyUnitInputDto;
+import fr.insee.genesis.controller.dto.SurveyUnitQualityToolDto;
 import fr.insee.genesis.controller.dto.SurveyUnitSimplifiedDto;
 import fr.insee.genesis.controller.utils.AuthUtils;
 import fr.insee.genesis.controller.utils.ControllerUtils;
+import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
 import fr.insee.genesis.domain.model.surveyunit.DataState;
 import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
@@ -14,57 +19,110 @@
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
 import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
+import fr.insee.genesis.exceptions.GenesisError;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
 import fr.insee.modelefiliere.RawResponseDto;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+@Slf4j
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 class ResponseControllerUnitTest {
-    static ResponseController responseController;
 
-    static SurveyUnitApiPort surveyUnitApiPort;
-    static SurveyUnitQualityService surveyUnitQualityService;
-    static QuestionnaireMetadataService questionnaireMetadataService;
-    static DataProcessingContextApiPort dataProcessingContextApiPort;
+    @Mock
+    private SurveyUnitApiPort surveyUnitApiPort;
+    @Mock
+    private SurveyUnitQualityService surveyUnitQualityService;
+    @Mock
+    private QuestionnaireMetadataService questionnaireMetadataService;
+    @Mock
+    private DataProcessingContextApiPort dataProcessingContextApiPort;
+    @Mock
+    private AuthUtils authUtils;
 
-    static FileUtils fileUtils = new FileUtils(new ConfigStub());
+    private ResponseController responseController;
+
+    private final FileUtils fileUtils = new FileUtils(TestConstants.getConfigStub());
 
     @BeforeEach
     void init(){
         //Mocks
-        surveyUnitApiPort = mock(SurveyUnitApiPort.class);
-        surveyUnitQualityService = mock(SurveyUnitQualityService.class);
-        questionnaireMetadataService = mock(QuestionnaireMetadataService.class);
-        dataProcessingContextApiPort = mock(DataProcessingContextApiPort.class);
-
         responseController = new ResponseController(
                 surveyUnitApiPort,
                 surveyUnitQualityService,
-                new FileUtils(new ConfigStub()),
+                new FileUtils(TestConstants.getConfigStub()),
                 new ControllerUtils(fileUtils),
-                new AuthUtils(new ConfigStub()),
+                authUtils,
                 questionnaireMetadataService,
                 dataProcessingContextApiPort
         );
     }
 
+    @Test
+    void deleteAllResponsesByCollectionInstrument_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+
+        //WHEN
+        responseController.deleteAllResponsesByCollectionInstrument(collectionInstrumentId);
+
+        //THEN
+        verify(surveyUnitApiPort, times(1)).deleteByCollectionInstrumentId(collectionInstrumentId);
+    }
+
+    @Test
+    void findResponsesByInterrogationAndCollectionInstrument_test() {
+        //GIVEN
+        String interrogationId = "testInterrogation";
+        String collectionInstrumentId = "testColIns";
+        List<SurveyUnitModel> surveyUnitModelList = List.of(
+                new SurveyUnitModel()
+        );
+        doReturn(surveyUnitModelList).when(surveyUnitApiPort)
+                .findByIdsInterrogationAndCollectionInstrument(any(), any());
+
+        //WHEN
+        ResponseEntity<List<SurveyUnitModel>> response = responseController.findResponsesByInterrogationAndCollectionInstrument(
+                interrogationId, collectionInstrumentId
+        );
+
+        //THEN
+        verify(surveyUnitApiPort).findByIdsInterrogationAndCollectionInstrument(
+                interrogationId,
+                collectionInstrumentId
+        );
+        Assertions.assertThat(response.getBody()).isEqualTo(surveyUnitModelList);
+    }
+
     @Test
     @SneakyThrows
     void getResponseByCollectionInstrumentAndInterrogation_test(){
@@ -96,6 +154,67 @@ void getResponseByCollectionInstrumentAndInterrogation_test(){
         Assertions.assertThat(response.getBody()).isEqualTo(surveyUnitSimplifiedDto);
     }
 
+    @Test
+    @SneakyThrows
+    void findResponsesByInterrogationAndCollectionInstrumentLatestStates_test() {
+        //GIVEN
+        String interrogationId = "testInterrogation";
+        String collectionInstrumentId = "testColIns";
+
+        DataProcessingContextModel dataProcessingContextModel = DataProcessingContextModel.builder()
+                .withReview(true)
+                .build();
+        doReturn(dataProcessingContextModel).when(dataProcessingContextApiPort).getContext(
+                any()
+        );
+
+        SurveyUnitDto surveyUnitDto = SurveyUnitDto.builder()
+                .interrogationId(interrogationId)
+                .build();
+        doReturn(surveyUnitDto).when(surveyUnitApiPort)
+                .findLatestValuesByStateByIdAndByCollectionInstrumentId(any(), any());
+
+        //WHEN
+        ResponseEntity<Object> response = responseController
+                .findResponsesByInterrogationAndCollectionInstrumentLatestStates(
+                        interrogationId,
+                        collectionInstrumentId
+                );
+
+        //THEN
+        verify(dataProcessingContextApiPort, times(1)).getContext(interrogationId);
+        verify(surveyUnitApiPort, times(1)).findLatestValuesByStateByIdAndByCollectionInstrumentId(
+                interrogationId,
+                collectionInstrumentId
+        );
+        Assertions.assertThat(response.getBody()).isNotNull().isInstanceOf(SurveyUnitQualityToolDto.class);
+        SurveyUnitQualityToolDto surveyUnitQualityToolDto = (SurveyUnitQualityToolDto) response.getBody();
+        Assertions.assertThat(surveyUnitQualityToolDto.getInterrogationId()).isEqualTo(interrogationId);
+    }
+
+    @Test
+    void getLatestByInterrogationAndCollectionInstrument_test() {
+        //GIVEN
+        String interrogationId = "testInterrogation";
+        String collectionInstrumentId = "testColIns";
+        List<SurveyUnitModel> surveyUnitModelList = List.of(
+                SurveyUnitModel.builder().interrogationId(interrogationId).build()
+        );
+        doReturn(surveyUnitModelList).when(surveyUnitApiPort).findLatestByIdAndByCollectionInstrumentId(any(), any());
+
+        //WHEN
+        ResponseEntity<List<SurveyUnitModel>> response = responseController.getLatestByInterrogationAndCollectionInstrument(
+                interrogationId,
+                collectionInstrumentId
+        );
+
+        //THEN
+        verify(surveyUnitApiPort, times(1))
+                .findLatestByIdAndByCollectionInstrumentId(interrogationId, collectionInstrumentId);
+        Assertions.assertThat(response.getBody()).isEqualTo(surveyUnitModelList);
+    }
+
+
     @Test
     @SneakyThrows
     void getResponseByCollectionInstrumentAndInterrogationList_test(){
@@ -140,15 +259,66 @@ void getResponseByCollectionInstrumentAndInterrogationList_test(){
     //Non regression test of #22876 and #22875
     @ParameterizedTest
     @ValueSource(booleans = {false, true})
-    void shouldReturnNewVariablesInSimplifiedResponsesWhereInAnyOrder(boolean isReversed){
+    void getLatestByInterrogationOneObject_test(boolean isReversed) {
+        //GIVEN
+        String interrogationId = "testInterrogation";
+        String collectionInstrumentId = "testColIns";
+        LocalDateTime validationDate = LocalDateTime.now();
+        RawResponseDto.QuestionnaireStateEnum questionnaireState = RawResponseDto.QuestionnaireStateEnum.FINISHED;
+        Mode mode = Mode.WEB;
+
+        List<SurveyUnitModel> surveyUnitModelList = List.of(
+                SurveyUnitModel.builder()
+                        .collectionInstrumentId(collectionInstrumentId)
+                        .interrogationId(interrogationId)
+                        .validationDate(validationDate)
+                        .mode(mode)
+                        .collectedVariables(new ArrayList<>())
+                        .externalVariables(new ArrayList<>())
+                        .build(),
+                SurveyUnitModel.builder()
+                        .collectionInstrumentId(collectionInstrumentId)
+                        .interrogationId(interrogationId)
+                        .questionnaireState(questionnaireState)
+                        .mode(mode)
+                        .collectedVariables(new ArrayList<>())
+                        .externalVariables(new ArrayList<>())
+                        .build()
+        );
+        doReturn(isReversed ? surveyUnitModelList.reversed() : surveyUnitModelList)
+                .when(surveyUnitApiPort).findLatestByIdAndByCollectionInstrumentId(any(), any());
+
+        //WHEN
+        ResponseEntity<SurveyUnitSimplifiedDto> response = responseController.getLatestByInterrogationOneObject(
+                interrogationId,
+                collectionInstrumentId,
+                mode
+        );
+
+        //THEN
+        verify(surveyUnitApiPort).findLatestByIdAndByCollectionInstrumentId(interrogationId, collectionInstrumentId);
+        Assertions.assertThat(response.getBody()).isNotNull();
+        Assertions.assertThat(response.getBody().getInterrogationId()).isEqualTo(interrogationId);
+        Assertions.assertThat(response.getBody().getCollectionInstrumentId()).isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(response.getBody().getMode()).isEqualTo(mode);
+        Assertions.assertThat(response.getBody().getQuestionnaireState()).isEqualTo(questionnaireState);
+        Assertions.assertThat(response.getBody().getValidationDate()).isEqualTo(validationDate);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    void getLatestForInterrogationListAndCollectionInstrument_test(boolean isReversed){
         //GIVEN
+        String interrogationId = "testInterrogation";
+        String collectionInstrumentId = "testColIns";
         String usId = "IDUE";
         String varId = "varid";
+        Mode mode = Mode.WEB;
         LocalDateTime validationDate = LocalDateTime.now();
         RawResponseDto.QuestionnaireStateEnum questionnaireState = RawResponseDto.QuestionnaireStateEnum.FINISHED;
 
         //Mock behaviour
-        doReturn(Collections.singletonList(Mode.WEB)).when(surveyUnitApiPort).findModesByCollectionInstrumentId(any());
+        doReturn(Collections.singletonList(mode)).when(surveyUnitApiPort).findModesByCollectionInstrumentId(any());
         List<SurveyUnitModel> surveyUnitModelList = new ArrayList<>();
         //Collected
         List<VariableModel> collectedVariables = new ArrayList<>();
@@ -161,13 +331,13 @@ void shouldReturnNewVariablesInSimplifiedResponsesWhereInAnyOrder(boolean isReve
         );
         surveyUnitModelList.add(
                 SurveyUnitModel.builder()
-                        .mode(Mode.WEB)
+                        .mode(mode)
                         .questionnaireState(questionnaireState)
                         .validationDate(validationDate)
                         .state(DataState.COLLECTED)
                         .usualSurveyUnitId(usId)
-                        .collectionInstrumentId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID)
-                        .interrogationId(TestConstants.DEFAULT_INTERROGATION_ID)
+                        .collectionInstrumentId(collectionInstrumentId)
+                        .interrogationId(interrogationId)
                         .collectedVariables(collectedVariables)
                         .externalVariables(new ArrayList<>())
                         .recordDate(LocalDateTime.now().minusMinutes(5))
@@ -185,29 +355,186 @@ void shouldReturnNewVariablesInSimplifiedResponsesWhereInAnyOrder(boolean isReve
         );
         surveyUnitModelList.add(
                 SurveyUnitModel.builder()
-                        .mode(Mode.WEB)
+                        .mode(mode)
                         .state(DataState.EDITED)
-                        .collectionInstrumentId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID)
-                        .interrogationId(TestConstants.DEFAULT_INTERROGATION_ID)
+                        .collectionInstrumentId(collectionInstrumentId)
+                        .interrogationId(interrogationId)
                         .collectedVariables(collectedVariables)
                         .externalVariables(new ArrayList<>())
                         .recordDate(LocalDateTime.now().minusMinutes(1))
                         .build()
         );
 
-        doReturn(isReversed ? surveyUnitModelList.reversed() : surveyUnitModelList).when(surveyUnitApiPort).findLatestByIdAndByCollectionInstrumentId(any(), any());
+        doReturn(isReversed ? surveyUnitModelList.reversed() : surveyUnitModelList).when(surveyUnitApiPort)
+                .findLatestByIdAndByCollectionInstrumentId(any(), any());
 
         //WHEN
-        ResponseEntity<List<SurveyUnitSimplifiedDto>> returnedResponse = responseController.getLatestForInterrogationListAndCollectionInstrument(
-                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
-                Collections.singletonList(new InterrogationId(TestConstants.DEFAULT_INTERROGATION_ID))
+        ResponseEntity<List<SurveyUnitSimplifiedDto>> returnedResponse = responseController
+                .getLatestForInterrogationListAndCollectionInstrument(
+                    collectionInstrumentId,
+                    Collections.singletonList(new InterrogationId(interrogationId))
         );
 
         //THEN
+        verify(surveyUnitApiPort).findLatestByIdAndByCollectionInstrumentId(interrogationId, collectionInstrumentId);
+
         Assertions.assertThat(returnedResponse.getStatusCode().is2xxSuccessful()).isTrue();
+        Assertions.assertThat(returnedResponse.getBody()).isNotNull();
         Assertions.assertThat(returnedResponse.getBody()).hasSize(1);
+        Assertions.assertThat(returnedResponse.getBody().getFirst().getInterrogationId()).isEqualTo(interrogationId);
+        Assertions.assertThat(returnedResponse.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(returnedResponse.getBody().getFirst().getMode()).isEqualTo(mode);
         Assertions.assertThat(returnedResponse.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(usId);
         Assertions.assertThat(returnedResponse.getBody().getFirst().getValidationDate()).isEqualTo(validationDate);
         Assertions.assertThat(returnedResponse.getBody().getFirst().getQuestionnaireState()).isEqualTo(questionnaireState);
     }
+
+    @Test
+    @SneakyThrows
+    void saveEditedVariables_test() {
+        //GIVEN
+        String questionnaireId = "testQuest";
+        String interrogationId = "testInterrogation";
+        Mode mode = Mode.WEB;
+        String idep = "AAAAA";
+
+        //FIXME Will be fixed in another branch
+        doReturn(new HashSet<>()).when(surveyUnitApiPort).findCampaignIdsFrom(any());
+        MetadataModel metadataModel = new MetadataModel();
+        doReturn(metadataModel).when(questionnaireMetadataService).loadAndSaveIfNotExists(
+                any(),any(),any(),any(), anyList());
+        doReturn(new ArrayList<>()).when(surveyUnitQualityService).checkVariablesPresentInMetadata(anyList(), any());
+        doReturn(idep).when(authUtils).getIDEP();
+        List<SurveyUnitModel> surveyUnitModelList = List.of(
+                SurveyUnitModel.builder()
+                        .collectionInstrumentId(questionnaireId)
+                        .interrogationId(interrogationId)
+                        .state(DataState.COLLECTED)
+                        .questionnaireState(RawResponseDto.QuestionnaireStateEnum.STARTED)
+                        .mode(mode)
+                        .collectedVariables(new ArrayList<>())
+                        .externalVariables(new ArrayList<>())
+                        .build(),
+                SurveyUnitModel.builder()
+                        .collectionInstrumentId(questionnaireId)
+                        .interrogationId(interrogationId)
+                        .state(DataState.EDITED)
+                        .mode(mode)
+                        .collectedVariables(new ArrayList<>())
+                        .externalVariables(new ArrayList<>())
+                        .modifiedBy(idep)
+                        .build()
+        );
+        doReturn(surveyUnitModelList).when(surveyUnitApiPort).parseEditedVariables(any(),any(),any());
+
+        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
+                .questionnaireId(questionnaireId)
+                .interrogationId(interrogationId)
+                .mode(mode)
+                .collectedVariables(new ArrayList<>())
+                .build();
+
+        //WHEN
+        ResponseEntity<Object> response = responseController.saveEditedVariables(surveyUnitInputDto);
+
+        //THEN
+        if(response.getStatusCode().value() != 200){
+            log.error("Unexpected status : {}", response.getStatusCode().value());
+            Assertions.assertThat(response.getBody()).isNotNull();
+            log.error(response.getBody().toString());
+            Assertions.fail();
+        }
+        verify(questionnaireMetadataService, times(1)).loadAndSaveIfNotExists(isNull(), eq(questionnaireId), eq(mode),
+                any(),
+                any());
+        verify(surveyUnitQualityService, times(1)).verifySurveyUnits(
+                any(), eq(metadataModel.getVariables())
+        );
+        verify(surveyUnitApiPort, times(1)).parseEditedVariables(
+                surveyUnitInputDto,
+                idep,
+                metadataModel.getVariables()
+        );
+        verify(surveyUnitApiPort, times(1)).saveSurveyUnits(anyList());
+    }
+
+    @Test
+    @SneakyThrows
+    void saveEditedVariables_null_metadata_test() {
+        //GIVEN
+        doReturn(Set.of("test")).when(surveyUnitApiPort).findCampaignIdsFrom(any());
+        doAnswer(invocation -> {
+                    List<GenesisError> list = invocation.getArgument(4);
+                    list.add(new GenesisError(""));
+                    return null;
+                }
+        ).when(questionnaireMetadataService).loadAndSaveIfNotExists(any(), any(), any(), any(), anyList());
+
+        //No metadataModel
+        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
+                .questionnaireId("testQuest")
+                .interrogationId("testInterro")
+                .mode(Mode.WEB)
+                .collectedVariables(new ArrayList<>())
+                .build();
+
+        //WHEN
+        ResponseEntity<Object> response = responseController.saveEditedVariables(surveyUnitInputDto);
+
+        //THEN
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(404);
+    }
+
+    @Test
+    @SneakyThrows
+    void saveEditedVariables_absent_variables_test() {
+        //GIVEN
+        String questionnaireId = "testQuest";
+        String interrogationId = "testInterrogation";
+        Mode mode = Mode.WEB;
+        String idep = "AAAAA";
+
+        doReturn(Set.of("test")).when(surveyUnitApiPort).findCampaignIdsFrom(any());
+        MetadataModel metadataModel = new MetadataModel();
+        doReturn(metadataModel).when(questionnaireMetadataService).loadAndSaveIfNotExists(
+                any(),any(),any(),any(), anyList());
+        //1 absent variable
+        doReturn(List.of("absentVariable")).when(surveyUnitQualityService)
+                .checkVariablesPresentInMetadata(anyList(), any());
+        doReturn(idep).when(authUtils).getIDEP();
+        List<SurveyUnitModel> surveyUnitModelList = List.of(
+                SurveyUnitModel.builder()
+                        .collectionInstrumentId(questionnaireId)
+                        .interrogationId(interrogationId)
+                        .state(DataState.COLLECTED)
+                        .questionnaireState(RawResponseDto.QuestionnaireStateEnum.STARTED)
+                        .mode(mode)
+                        .collectedVariables(new ArrayList<>())
+                        .externalVariables(new ArrayList<>())
+                        .build(),
+                SurveyUnitModel.builder()
+                        .collectionInstrumentId(questionnaireId)
+                        .interrogationId(interrogationId)
+                        .state(DataState.EDITED)
+                        .mode(mode)
+                        .collectedVariables(new ArrayList<>())
+                        .externalVariables(new ArrayList<>())
+                        .modifiedBy(idep)
+                        .build()
+        );
+        doReturn(surveyUnitModelList).when(surveyUnitApiPort).parseEditedVariables(any(),any(),any());
+
+        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
+                .questionnaireId(questionnaireId)
+                .interrogationId(interrogationId)
+                .mode(mode)
+                .collectedVariables(new ArrayList<>())
+                .build();
+
+        //WHEN
+        ResponseEntity<Object> response = responseController.saveEditedVariables(surveyUnitInputDto);
+
+        //THEN
+        Assertions.assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    }
 }
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/Utils.java b/src/test/java/fr/insee/genesis/controller/rest/responses/Utils.java
deleted file mode 100644
index d3753907..00000000
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/Utils.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package fr.insee.genesis.controller.rest.responses;
-
-
-import fr.insee.genesis.TestConstants;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.model.surveyunit.VariableModel;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_SURVEY_UNIT_ID;
-
-
-class Utils {
-
-    static void reset(SurveyUnitPersistencePortStub surveyUnitPersistencePortStub) throws IOException {
-        //MongoDB stub management
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-
-        addAdditionalSurveyUnitModelToMongoStub("TEST-TABLEAUX", DEFAULT_COLLECTION_INSTRUMENT_ID, DEFAULT_SURVEY_UNIT_ID,
-                LocalDateTime.of(2023, 1, 1, 0, 0, 0),
-                LocalDateTime.of(2024, 1, 1, 0, 0, 0),
-                surveyUnitPersistencePortStub);
-
-
-        //Test file management
-        //Clean DONE folder
-        Path testResourcesPath = Path.of(TestConstants.TEST_RESOURCES_DIRECTORY);
-        if (testResourcesPath.resolve("DONE").toFile().exists())
-            Files.walk(testResourcesPath.resolve("DONE"))
-                    .sorted(Comparator.reverseOrder())
-                    .map(Path::toFile)
-                    .forEach(File::delete);
-
-        //Recreate data files
-        //SAMPLETEST-PARADATA-V1
-        //Root
-        //Partial
-        Path source = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("reponse-platine")
-                .resolve("data.complete.partial.STPDv1.20231122164209.xml");
-        Path dest = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("data.complete.partial.STPDv1.20231122164209.xml");
-        if (!dest.toFile().exists()) {
-            Files.copy(source, dest);
-        }
-
-        //Validated
-        source = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("reponse-platine")
-                .resolve("data.complete.validated.STPDv1.20231122164209.xml");
-        dest = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("data.complete.validated.STPDv1.20231122164209.xml");
-        if (!dest.toFile().exists()) {
-            Files.copy(source, dest);
-        }
-
-        //Differential data
-        //Partial
-        source = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("reponse-platine")
-                .resolve("data.complete.partial.STPDv1.20231122164209.xml");
-        dest = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("differential")
-                .resolve("data")
-                .resolve("data.complete.partial.STPDv1.20231122164209.xml");
-        if (!dest.toFile().exists()) {
-            Files.copy(source, dest);
-        }
-
-        source = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("reponse-platine")
-                .resolve("data.complete.validated.STPDv1.20231122164209.xml");
-        dest = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V1")
-                .resolve("differential")
-                .resolve("data")
-                .resolve("data.complete.validated.STPDv1.20231122164209.xml");
-        if (!dest.toFile().exists()) {
-            Files.copy(source, dest);
-        }
-
-        //SAMPLETEST-PARADATA-V2
-        //Partial
-        source = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V2")
-                .resolve("reponse-platine")
-                .resolve("data.complete.partial.STPDv2.20231122164209.xml");
-        dest = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V2")
-                .resolve("data.complete.partial.STPDv2.20231122164209.xml");
-        if (!dest.toFile().exists()) {
-            Files.copy(source, dest);
-        }
-
-        //Validated
-        source = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V2")
-                .resolve("reponse-platine")
-                .resolve("data.complete.validated.STPDv2.20231122164209.xml");
-        dest = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-PARADATA-V2")
-                .resolve("data.complete.validated.STPDv2.20231122164209.xml");
-        if (!dest.toFile().exists()) {
-            Files.copy(source, dest);
-        }
-
-        //SAMPLETEST-NO-COLLECTED
-        source = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-NO-COLLECTED")
-                .resolve("data_diff_no_collected.xml");
-
-        dest = testResourcesPath
-                .resolve("IN")
-                .resolve("WEB")
-                .resolve("SAMPLETEST-NO-COLLECTED")
-                .resolve("differential")
-                .resolve("data")
-                .resolve("data_diff_no_collected.xml");
-        if (!dest.toFile().exists()) {
-            Files.copy(source, dest);
-        }
-    }
-
-    static void addAdditionalSurveyUnitModelToMongoStub(SurveyUnitPersistencePortStub surveyUnitPersistencePortStub) {
-        addAdditionalSurveyUnitModelToMongoStub(DEFAULT_COLLECTION_INSTRUMENT_ID, surveyUnitPersistencePortStub);
-    }
-
-    static void addAdditionalSurveyUnitModelToMongoStub(String questionnaireId, SurveyUnitPersistencePortStub surveyUnitPersistencePortStub) {
-        addAdditionalSurveyUnitModelToMongoStub("TEST-TABLEAUX",questionnaireId, surveyUnitPersistencePortStub);
-    }
-
-    static void addAdditionalSurveyUnitModelToMongoStub(String campaignId, String questionnaireId, SurveyUnitPersistencePortStub surveyUnitPersistencePortStub) {
-        addAdditionalSurveyUnitModelToMongoStub(campaignId,questionnaireId, DEFAULT_SURVEY_UNIT_ID,
-                LocalDateTime.of(2023, 2, 2, 0, 0, 0),
-                LocalDateTime.of(2024, 2, 2, 0, 0, 0),
-                surveyUnitPersistencePortStub);
-    }
-
-    static void addAdditionalSurveyUnitModelToMongoStub(String campaignId, String questionnaireId, String idUE,
-                                                        LocalDateTime fileDate, LocalDateTime recordDate,
-                                                        SurveyUnitPersistencePortStub surveyUnitPersistencePortStub) {
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel externalVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(externalVariable);
-        externalVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(externalVariable);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-        collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .scope("TESTSCOPE")
-                .iteration(2)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-
-        SurveyUnitModel recentSurveyUnitModel = SurveyUnitModel.builder()
-                .campaignId(campaignId)
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .usualSurveyUnitId(idUE)
-                .collectionInstrumentId(questionnaireId)
-                .state(DataState.COLLECTED)
-                .fileDate(fileDate)
-                .recordDate(recordDate)
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentSurveyUnitModel);
-    }
-
-
-
-    static void addAdditionalSurveyUnitModelToMongoStub(DataState state,
-                                                        String collectedVariableValue,
-                                                        String externalVariableValue,
-                                                        LocalDateTime fileDate,
-                                                        LocalDateTime recordDate,
-                                                        SurveyUnitPersistencePortStub surveyUnitPersistencePortStub) {
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value(externalVariableValue)
-                .iteration(1)
-                .build();
-        externalVariableList.add(variable);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value(collectedVariableValue)
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-
-        collectedVariableList.add(collectedVariable);
-
-        SurveyUnitModel recentSurveyUnitModel = SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .state(state)
-                .fileDate(fileDate)
-                .recordDate(recordDate)
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentSurveyUnitModel);
-    }
-
-    static void addAdditionalSurveyUnitModelToMongoStub(DataState state,
-                                                        String variableName,
-                                                        String collectedVariableValue,
-                                                        String externalVariableValue,
-                                                        LocalDateTime fileDate,
-                                                        LocalDateTime recordDate,
-                                                        SurveyUnitPersistencePortStub surveyUnitPersistencePortStub) {
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel variable = VariableModel.builder()
-                .varId(variableName)
-                .value(externalVariableValue)
-                .iteration(1)
-                .build();
-        externalVariableList.add(variable);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId(variableName)
-                .value(collectedVariableValue)
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-
-        collectedVariableList.add(collectedVariable);
-
-        SurveyUnitModel recentSurveyUnitModel = SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .state(state)
-                .fileDate(fileDate)
-                .recordDate(recordDate)
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentSurveyUnitModel);
-    }
-
-}
diff --git a/src/test/java/fr/insee/genesis/controller/utils/GroupUtilsTest.java b/src/test/java/fr/insee/genesis/controller/utils/GroupUtilsTest.java
index 279693cd..cbe57b05 100644
--- a/src/test/java/fr/insee/genesis/controller/utils/GroupUtilsTest.java
+++ b/src/test/java/fr/insee/genesis/controller/utils/GroupUtilsTest.java
@@ -1,10 +1,10 @@
 package fr.insee.genesis.controller.utils;
 
-import fr.insee.genesis.Constants;
 import fr.insee.bpm.metadata.model.Group;
 import fr.insee.bpm.metadata.model.MetadataModel;
 import fr.insee.bpm.metadata.model.Variable;
 import fr.insee.bpm.metadata.model.VariableType;
+import fr.insee.genesis.Constants;
 import fr.insee.genesis.domain.utils.GroupUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/fr/insee/genesis/domain/model/context/DataProcessingContextModelTest.java b/src/test/java/fr/insee/genesis/domain/model/context/DataProcessingContextModelTest.java
new file mode 100644
index 00000000..886bf3d6
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/model/context/DataProcessingContextModelTest.java
@@ -0,0 +1,37 @@
+package fr.insee.genesis.domain.model.context;
+
+import fr.insee.genesis.controller.dto.ScheduleDto;
+import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+class DataProcessingContextModelTest {
+    @Test
+    void toScheduleDto_test() {
+        //GIVEN
+        String collectionInstrumentId = "collectionInstrumentId";
+        LocalDateTime lastExecution = LocalDateTime.now();
+        List<KraftwerkExecutionSchedule> kraftwerkExecutionScheduleList = new ArrayList<>();
+        boolean withReview = true;
+
+
+        DataProcessingContextModel dataProcessingContextModel = DataProcessingContextModel.builder()
+                .collectionInstrumentId(collectionInstrumentId)
+                .lastExecution(lastExecution)
+                .kraftwerkExecutionScheduleList(kraftwerkExecutionScheduleList)
+                .withReview(withReview)
+                .build();
+        //WHEN
+        ScheduleDto scheduleDto = dataProcessingContextModel.toScheduleDto();
+
+        //THEN
+        Assertions.assertThat(scheduleDto.collectionInstrumentId()).isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(scheduleDto.lastExecution()).isEqualTo(lastExecution);
+        Assertions.assertThat(scheduleDto.kraftwerkExecutionScheduleList()).isEqualTo(kraftwerkExecutionScheduleList);
+        Assertions.assertThat(scheduleDto.surveyName()).isNull();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/model/surveyunit/InterrogationIdTest.java b/src/test/java/fr/insee/genesis/domain/model/surveyunit/InterrogationIdTest.java
new file mode 100644
index 00000000..3a41f838
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/model/surveyunit/InterrogationIdTest.java
@@ -0,0 +1,33 @@
+package fr.insee.genesis.domain.model.surveyunit;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class InterrogationIdTest {
+
+    @Test
+    void getInterrogationId_test() {
+        //GIVEN
+        String identifier = "test";
+        InterrogationId interrogationId = new InterrogationId(identifier);
+
+        //WHEN
+        String result = interrogationId.getInterrogationId();
+
+        //THEN
+        Assertions.assertThat(result).isEqualTo(identifier);
+    }
+
+    @Test
+    void setInterrogationId_test() {
+        //GIVEN
+        String identifier = "test";
+        InterrogationId interrogationId = new InterrogationId();
+
+        //WHEN
+        interrogationId.setInterrogationId(identifier);
+
+        //THEN
+        Assertions.assertThat(interrogationId.getInterrogationId()).isEqualTo(identifier);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/model/surveyunit/ModeTest.java b/src/test/java/fr/insee/genesis/domain/model/surveyunit/ModeTest.java
new file mode 100644
index 00000000..91dc69b7
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/model/surveyunit/ModeTest.java
@@ -0,0 +1,309 @@
+package fr.insee.genesis.domain.model.surveyunit;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class ModeTest {
+
+    // -------------------------------------------------------------------------
+    // Enum values & properties
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("Enum constants and their properties")
+    class EnumConstantsTests {
+
+        @Test
+        @DisplayName("WEB should have correct properties")
+        void web_shouldHaveCorrectProperties() {
+            assertThat(Mode.WEB.getModeName()).isEqualTo("WEB");
+            assertThat(Mode.WEB.getFolder()).isEqualTo("WEB");
+            assertThat(Mode.WEB.getJsonName()).isEqualTo("CAWI");
+        }
+
+        @Test
+        @DisplayName("TEL should have correct properties")
+        void tel_shouldHaveCorrectProperties() {
+            assertThat(Mode.TEL.getModeName()).isEqualTo("TEL");
+            assertThat(Mode.TEL.getFolder()).isEqualTo("ENQ");
+            assertThat(Mode.TEL.getJsonName()).isEqualTo("CATI");
+        }
+
+        @Test
+        @DisplayName("F2F should have correct properties")
+        void f2f_shouldHaveCorrectProperties() {
+            assertThat(Mode.F2F.getModeName()).isEqualTo("F2F");
+            assertThat(Mode.F2F.getFolder()).isEqualTo("ENQ");
+            assertThat(Mode.F2F.getJsonName()).isEqualTo("CAPI");
+        }
+
+        @Test
+        @DisplayName("PAPER should have correct properties")
+        void paper_shouldHaveCorrectProperties() {
+            assertThat(Mode.PAPER.getModeName()).isEqualTo("PAPER");
+            assertThat(Mode.PAPER.getFolder()).isEmpty();
+            assertThat(Mode.PAPER.getJsonName()).isEqualTo("PAPI");
+        }
+
+        @Test
+        @DisplayName("OTHER should have empty folder and jsonName")
+        void other_shouldHaveEmptyFolderAndJsonName() {
+            assertThat(Mode.OTHER.getModeName()).isEqualTo("OTHER");
+            assertThat(Mode.OTHER.getFolder()).isEmpty();
+            assertThat(Mode.OTHER.getJsonName()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Enum should have exactly 5 values")
+        void enum_shouldHaveFiveValues() {
+            assertThat(Mode.values()).hasSize(5);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // fromString()
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("fromString() tests")
+    class FromStringTests {
+
+        @ParameterizedTest(name = "fromString(\"{0}\") should return {1}")
+        @CsvSource({
+                "WEB,   WEB",
+                "TEL,   TEL",
+                "F2F,   F2F",
+                "PAPER, PAPER",
+                "OTHER, OTHER",
+                // JSON names
+                "CAWI,  WEB",
+                "CATI,  TEL",
+                "CAPI,  F2F",
+                "PAPI,  PAPER",
+        })
+        @DisplayName("fromString should resolve by modeName or jsonName")
+        void fromString_shouldResolveKnownNames(String input, Mode expected) {
+            assertThat(Mode.fromString(input)).isEqualTo(expected);
+        }
+
+        @ParameterizedTest(name = "fromString(\"{0}\") should be case-insensitive")
+        @ValueSource(strings = {"web", "Web", "wEb", "cawi", "Cawi", "CAWI", "tel", "Tel"})
+        @DisplayName("fromString should be case-insensitive")
+        void fromString_shouldBeCaseInsensitive(String input) {
+            assertThat(Mode.fromString(input)).isNotNull();
+        }
+
+        @ParameterizedTest(name = "fromString(\"{0}\") should handle leading/trailing spaces")
+        @ValueSource(strings = {" WEB", "WEB ", " WEB ", " CAWI "})
+        @DisplayName("fromString should trim whitespace")
+        void fromString_shouldTrimInput(String input) {
+            assertThat(Mode.fromString(input)).isNotNull();
+        }
+
+        @Test
+        @DisplayName("fromString(null) should return null")
+        void fromString_null_shouldReturnNull() {
+            assertThat(Mode.fromString(null)).isNull();
+        }
+
+        @ParameterizedTest(name = "fromString(\"{0}\") should throw IllegalArgumentException")
+        @ValueSource(strings = {"UNKNOWN", "invalid", "123", "WE B", "ENQ"})
+        @DisplayName("fromString with unknown value should throw IllegalArgumentException")
+        void fromString_unknownValue_shouldThrow(String input) {
+            assertThatThrownBy(() -> Mode.fromString(input))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageContaining("Invalid Mode")
+                    .hasMessageContaining(input);
+        }
+
+        @Test
+        @DisplayName("fromString with blank string should throw IllegalArgumentException")
+        void fromString_blankString_shouldThrow() {
+            assertThatThrownBy(() -> Mode.fromString("   "))
+                    .isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageContaining("Invalid Mode");
+        }
+
+        @Test
+        @DisplayName("fromString with empty string should throw IllegalArgumentException")
+        void fromString_emptyString_shouldThrow() {
+            assertThatThrownBy(() -> Mode.fromString(""))
+                    .isInstanceOf(IllegalArgumentException.class);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // getEnumFromModeName()
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("getEnumFromModeName() tests")
+    class GetEnumFromModeNameTests {
+
+        @ParameterizedTest(name = "getEnumFromModeName(\"{0}\") should return {1}")
+        @CsvSource({
+                "WEB,   WEB",
+                "TEL,   TEL",
+                "F2F,   F2F",
+                "PAPER, PAPER",
+                "OTHER, OTHER",
+        })
+        @DisplayName("getEnumFromModeName should resolve known mode names")
+        void getEnumFromModeName_shouldResolveKnownNames(String input, Mode expected) {
+            assertThat(Mode.getEnumFromModeName(input)).isEqualTo(expected);
+        }
+
+        @ParameterizedTest(name = "getEnumFromModeName(\"{0}\") should be case-insensitive")
+        @ValueSource(strings = {"web", "Web", "WEB", "tel", "f2f", "paper"})
+        @DisplayName("getEnumFromModeName should be case-insensitive")
+        void getEnumFromModeName_shouldBeCaseInsensitive(String input) {
+            assertThat(Mode.getEnumFromModeName(input)).isNotNull();
+        }
+
+        @Test
+        @DisplayName("getEnumFromModeName(null) should return null")
+        void getEnumFromModeName_null_shouldReturnNull() {
+            assertThat(Mode.getEnumFromModeName(null)).isNull();
+        }
+
+        @Test
+        @DisplayName("getEnumFromModeName should trim whitespace")
+        void getEnumFromModeName_shouldTrimInput() {
+            assertThat(Mode.getEnumFromModeName(" WEB ")).isEqualTo(Mode.WEB);
+        }
+
+        @ParameterizedTest(name = "getEnumFromModeName(\"{0}\") should return null for JSON names")
+        @ValueSource(strings = {"CAWI", "CATI", "CAPI", "PAPI"})
+        @DisplayName("getEnumFromModeName should NOT resolve JSON names")
+        void getEnumFromModeName_jsonName_shouldReturnNull(String jsonName) {
+            assertThat(Mode.getEnumFromModeName(jsonName)).isNull();
+        }
+
+        @Test
+        @DisplayName("getEnumFromModeName with unknown value should return null")
+        void getEnumFromModeName_unknownValue_shouldReturnNull() {
+            assertThat(Mode.getEnumFromModeName("UNKNOWN")).isNull();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // getEnumFromJsonName()
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("getEnumFromJsonName() tests")
+    class GetEnumFromJsonNameTests {
+
+        @ParameterizedTest(name = "getEnumFromJsonName(\"{0}\") should return {1}")
+        @CsvSource({
+                "CAWI, WEB",
+                "CATI, TEL",
+                "CAPI, F2F",
+                "PAPI, PAPER",
+        })
+        @DisplayName("getEnumFromJsonName should resolve known JSON names")
+        void getEnumFromJsonName_shouldResolveKnownJsonNames(String input, Mode expected) {
+            assertThat(Mode.getEnumFromJsonName(input)).isEqualTo(expected);
+        }
+
+        @ParameterizedTest(name = "getEnumFromJsonName(\"{0}\") should be case-insensitive")
+        @ValueSource(strings = {"cawi", "Cawi", "CAWI", "cati", "capi", "papi"})
+        @DisplayName("getEnumFromJsonName should be case-insensitive")
+        void getEnumFromJsonName_shouldBeCaseInsensitive(String input) {
+            assertThat(Mode.getEnumFromJsonName(input)).isNotNull();
+        }
+
+        @Test
+        @DisplayName("getEnumFromJsonName(null) should return null")
+        void getEnumFromJsonName_null_shouldReturnNull() {
+            assertThat(Mode.getEnumFromJsonName(null)).isNull();
+        }
+
+        @Test
+        @DisplayName("getEnumFromJsonName should trim whitespace")
+        void getEnumFromJsonName_shouldTrimInput() {
+            assertThat(Mode.getEnumFromJsonName(" CAWI ")).isEqualTo(Mode.WEB);
+        }
+
+        @ParameterizedTest(name = "getEnumFromJsonName(\"{0}\") should return null for mode names")
+        @ValueSource(strings = {"WEB", "TEL", "F2F", "PAPER"})
+        @DisplayName("getEnumFromJsonName should NOT resolve mode names")
+        void getEnumFromJsonName_modeName_shouldReturnNull(String modeName) {
+            assertThat(Mode.getEnumFromJsonName(modeName)).isNull();
+        }
+
+        @Test
+        @DisplayName("getEnumFromJsonName with unknown value should return null")
+        void getEnumFromJsonName_unknownValue_shouldReturnNull() {
+            assertThat(Mode.getEnumFromJsonName("UNKNOWN")).isNull();
+        }
+
+        @Test
+        @DisplayName("getEnumFromJsonName for OTHER (empty jsonName) should return null")
+        void getEnumFromJsonName_other_shouldReturnNull() {
+            // OTHER has an empty jsonName, so it is not indexed
+            assertThat(Mode.getEnumFromJsonName("OTHER")).isNull();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Lookup map integrity (cross-cutting)
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("Lookup map integrity tests")
+    class LookupMapIntegrityTests {
+
+        @Test
+        @DisplayName("BY_ANY_NAME should resolve both modeName and jsonName for WEB")
+        void byAnyName_shouldResolveWebByBothNames() {
+            assertThat(Mode.fromString("WEB")).isEqualTo(Mode.WEB);
+            assertThat(Mode.fromString("CAWI")).isEqualTo(Mode.WEB);
+        }
+
+        @Test
+        @DisplayName("BY_ANY_NAME should resolve both modeName and jsonName for TEL")
+        void byAnyName_shouldResolveTelByBothNames() {
+            assertThat(Mode.fromString("TEL")).isEqualTo(Mode.TEL);
+            assertThat(Mode.fromString("CATI")).isEqualTo(Mode.TEL);
+        }
+
+        @Test
+        @DisplayName("BY_ANY_NAME should resolve both modeName and jsonName for F2F")
+        void byAnyName_shouldResolveF2FByBothNames() {
+            assertThat(Mode.fromString("F2F")).isEqualTo(Mode.F2F);
+            assertThat(Mode.fromString("CAPI")).isEqualTo(Mode.F2F);
+        }
+
+        @Test
+        @DisplayName("BY_ANY_NAME should resolve both modeName and jsonName for PAPER")
+        void byAnyName_shouldResolvePaperByBothNames() {
+            assertThat(Mode.fromString("PAPER")).isEqualTo(Mode.PAPER);
+            assertThat(Mode.fromString("PAPI")).isEqualTo(Mode.PAPER);
+        }
+
+        @Test
+        @DisplayName("OTHER has blank folder and jsonName — not resolvable by jsonName")
+        void other_notResolvableByJsonName() {
+            assertThat(Mode.getEnumFromJsonName("")).isNull();
+            assertThat(Mode.getEnumFromJsonName("OTHER")).isNull();
+        }
+
+        @Test
+        @DisplayName("TEL and F2F share folder ENQ — folders are not used for lookup")
+        void telAndF2F_shareFolder_butFolderIsNotLookupKey() {
+            // folder is purely a property, not a lookup key
+            assertThat(Mode.TEL.getFolder()).isEqualTo(Mode.F2F.getFolder()).isEqualTo("ENQ");
+            // resolving by "ENQ" is not supported
+            assertThatThrownBy(() -> Mode.fromString("ENQ"))
+                    .isInstanceOf(IllegalArgumentException.class);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModelTest.java b/src/test/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModelTest.java
new file mode 100644
index 00000000..4796c406
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModelTest.java
@@ -0,0 +1,417 @@
+package fr.insee.genesis.domain.model.surveyunit;
+
+import fr.insee.modelefiliere.RawResponseDto;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("SurveyUnitModel Tests")
+class SurveyUnitModelTest {
+
+    private static final String INTERROGATION_ID = "interrogation-123";
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-456";
+    private static final String CAMPAIGN_ID = "campaign-789";
+    private static final String USUAL_SURVEY_UNIT_ID = "usual-unit-001";
+    private static final String TECHNICAL_SURVEY_UNIT_ID = "technical-unit-002";
+    private static final String MAJOR_MODEL_VERSION = "2";
+    private static final String MODIFIED_BY = "user-admin";
+
+    private Mode mockMode;
+    private LocalDateTime now;
+
+    @BeforeEach
+    void setUp() {
+        mockMode = Mode.WEB;
+        now = LocalDateTime.of(2025, 6, 15, 10, 30);
+    }
+
+    @Nested
+    @DisplayName("Constructor tests")
+    class ConstructorTests {
+
+        @Test
+        @DisplayName("No-args constructor should create an empty model")
+        void noArgsConstructor_shouldCreateEmptyModel() {
+            SurveyUnitModel model = new SurveyUnitModel();
+
+            assertThat(model).isNotNull();
+            assertThat(model.getInterrogationId()).isNull();
+            assertThat(model.getMode()).isNull();
+            assertThat(model.getCollectionInstrumentId()).isNull();
+            assertThat(model.getUsualSurveyUnitId()).isNull();
+            assertThat(model.getTechnicalSurveyUnitId()).isNull();
+            assertThat(model.getMajorModelVersion()).isNull();
+            assertThat(model.getState()).isNull();
+            assertThat(model.getIsCapturedIndirectly()).isNull();
+            assertThat(model.getQuestionnaireState()).isNull();
+            assertThat(model.getValidationDate()).isNull();
+            assertThat(model.getRecordDate()).isNull();
+            assertThat(model.getFileDate()).isNull();
+            assertThat(model.getCollectedVariables()).isNull();
+            assertThat(model.getExternalVariables()).isNull();
+            assertThat(model.getModifiedBy()).isNull();
+        }
+
+        @Test
+        @DisplayName("Constructor(interrogationId, mode) should set only those two fields")
+        void twoArgsConstructor_shouldSetInterrogationIdAndMode() {
+            SurveyUnitModel model = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+
+            assertThat(model.getInterrogationId()).isEqualTo(INTERROGATION_ID);
+            assertThat(model.getMode()).isEqualTo(mockMode);
+
+            // All other fields should be null
+            assertThat(model.getCollectionInstrumentId()).isNull();
+            assertThat(model.getUsualSurveyUnitId()).isNull();
+            assertThat(model.getState()).isNull();
+        }
+
+        @Test
+        @DisplayName("All-args constructor should set all fields")
+        void allArgsConstructor_shouldSetAllFields() {
+            List<VariableModel> collected = List.of();
+            List<VariableModel> external = List.of();
+
+            SurveyUnitModel model = new SurveyUnitModel(
+                    COLLECTION_INSTRUMENT_ID,
+                    CAMPAIGN_ID,
+                    INTERROGATION_ID,
+                    USUAL_SURVEY_UNIT_ID,
+                    TECHNICAL_SURVEY_UNIT_ID,
+                    MAJOR_MODEL_VERSION,
+                    DataState.COLLECTED,
+                    mockMode,
+                    true,
+                    RawResponseDto.QuestionnaireStateEnum.FINISHED,
+                    now,
+                    now,
+                    now,
+                    collected,
+                    external,
+                    MODIFIED_BY
+            );
+
+            assertThat(model.getCollectionInstrumentId()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+            assertThat(model.getInterrogationId()).isEqualTo(INTERROGATION_ID);
+            assertThat(model.getUsualSurveyUnitId()).isEqualTo(USUAL_SURVEY_UNIT_ID);
+            assertThat(model.getTechnicalSurveyUnitId()).isEqualTo(TECHNICAL_SURVEY_UNIT_ID);
+            assertThat(model.getMajorModelVersion()).isEqualTo(MAJOR_MODEL_VERSION);
+            assertThat(model.getState()).isEqualTo(DataState.COLLECTED);
+            assertThat(model.getMode()).isEqualTo(mockMode);
+            assertThat(model.getIsCapturedIndirectly()).isTrue();
+            assertThat(model.getQuestionnaireState()).isEqualTo(RawResponseDto.QuestionnaireStateEnum.FINISHED);
+            assertThat(model.getValidationDate()).isEqualTo(now);
+            assertThat(model.getRecordDate()).isEqualTo(now);
+            assertThat(model.getFileDate()).isEqualTo(now);
+            assertThat(model.getCollectedVariables()).isEqualTo(collected);
+            assertThat(model.getExternalVariables()).isEqualTo(external);
+            assertThat(model.getModifiedBy()).isEqualTo(MODIFIED_BY);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Builder
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("Builder tests")
+    class BuilderTests {
+
+        @Test
+        @DisplayName("Builder should create model with all specified fields")
+        void builder_shouldSetAllFields() {
+            List<VariableModel> collected = List.of();
+            List<VariableModel> external = List.of();
+
+            SurveyUnitModel model = SurveyUnitModel.builder()
+                    .collectionInstrumentId(COLLECTION_INSTRUMENT_ID)
+                    .interrogationId(INTERROGATION_ID)
+                    .usualSurveyUnitId(USUAL_SURVEY_UNIT_ID)
+                    .technicalSurveyUnitId(TECHNICAL_SURVEY_UNIT_ID)
+                    .majorModelVersion(MAJOR_MODEL_VERSION)
+                    .state(DataState.COLLECTED)
+                    .mode(mockMode)
+                    .isCapturedIndirectly(false)
+                    .questionnaireState(RawResponseDto.QuestionnaireStateEnum.FINISHED)
+                    .validationDate(now)
+                    .recordDate(now)
+                    .fileDate(now)
+                    .collectedVariables(collected)
+                    .externalVariables(external)
+                    .modifiedBy(MODIFIED_BY)
+                    .build();
+
+            assertThat(model.getCollectionInstrumentId()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+            assertThat(model.getInterrogationId()).isEqualTo(INTERROGATION_ID);
+            assertThat(model.getUsualSurveyUnitId()).isEqualTo(USUAL_SURVEY_UNIT_ID);
+            assertThat(model.getTechnicalSurveyUnitId()).isEqualTo(TECHNICAL_SURVEY_UNIT_ID);
+            assertThat(model.getMajorModelVersion()).isEqualTo(MAJOR_MODEL_VERSION);
+            assertThat(model.getState()).isEqualTo(DataState.COLLECTED);
+            assertThat(model.getMode()).isEqualTo(mockMode);
+            assertThat(model.getIsCapturedIndirectly()).isFalse();
+            assertThat(model.getQuestionnaireState()).isEqualTo(RawResponseDto.QuestionnaireStateEnum.FINISHED);
+            assertThat(model.getValidationDate()).isEqualTo(now);
+            assertThat(model.getRecordDate()).isEqualTo(now);
+            assertThat(model.getFileDate()).isEqualTo(now);
+            assertThat(model.getCollectedVariables()).isEqualTo(collected);
+            assertThat(model.getExternalVariables()).isEqualTo(external);
+            assertThat(model.getModifiedBy()).isEqualTo(MODIFIED_BY);
+        }
+
+        @Test
+        @DisplayName("Builder with only mandatory fields should leave others null")
+        void builder_withPartialFields_shouldLeaveOthersNull() {
+            SurveyUnitModel model = SurveyUnitModel.builder()
+                    .interrogationId(INTERROGATION_ID)
+                    .mode(mockMode)
+                    .build();
+
+            assertThat(model.getInterrogationId()).isEqualTo(INTERROGATION_ID);
+            assertThat(model.getMode()).isEqualTo(mockMode);
+            assertThat(model.getCollectionInstrumentId()).isNull();
+            assertThat(model.getState()).isNull();
+            assertThat(model.getValidationDate()).isNull();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Setters (Lombok @Data)
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("Setter tests (via @Data)")
+    class SetterTests {
+
+        @Test
+        @DisplayName("setInterrogationId should update the field")
+        void setInterrogationId_shouldUpdateField() {
+            SurveyUnitModel model = new SurveyUnitModel();
+            model.setInterrogationId(INTERROGATION_ID);
+            assertThat(model.getInterrogationId()).isEqualTo(INTERROGATION_ID);
+        }
+
+        @Test
+        @DisplayName("setMode should update the field")
+        void setMode_shouldUpdateField() {
+            SurveyUnitModel model = new SurveyUnitModel();
+            model.setMode(mockMode);
+            assertThat(model.getMode()).isEqualTo(mockMode);
+        }
+
+        @Test
+        @DisplayName("setIsCapturedIndirectly should update the boolean field")
+        void setIsCapturedIndirectly_shouldUpdateField() {
+            SurveyUnitModel model = new SurveyUnitModel();
+            model.setIsCapturedIndirectly(true);
+            assertThat(model.getIsCapturedIndirectly()).isTrue();
+        }
+
+        @Test
+        @DisplayName("setCollectedVariables should update the list")
+        void setCollectedVariables_shouldUpdateField() {
+            SurveyUnitModel model = new SurveyUnitModel();
+            List<VariableModel> variables = List.of(getVariableModel());
+            model.setCollectedVariables(variables);
+            assertThat(model.getCollectedVariables()).hasSize(1);
+        }
+
+        @Test
+        @DisplayName("setExternalVariables should update the list")
+        void setExternalVariables_shouldUpdateField() {
+            SurveyUnitModel model = new SurveyUnitModel();
+            List<VariableModel> variables = List.of(getVariableModel(), getVariableModel());
+            model.setExternalVariables(variables);
+            assertThat(model.getExternalVariables()).hasSize(2);
+        }
+    }
+
+    private static VariableModel getVariableModel() {
+        return new VariableModel(
+                "testVar",
+                "testValue",
+                DataState.COLLECTED,
+                "RACINE",
+                1,
+                null
+        );
+    }
+
+    // -------------------------------------------------------------------------
+    // equals()
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("equals() tests")
+    class EqualsTests {
+
+        @Test
+        @DisplayName("Same instance should be equal to itself")
+        void equals_sameInstance_shouldBeTrue() {
+            SurveyUnitModel model = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            assertThat(model).isEqualTo(model);
+        }
+
+        @Test
+        @DisplayName("Two models with same interrogationId and mode should be equal")
+        void equals_sameInterrogationIdAndMode_shouldBeTrue() {
+            SurveyUnitModel model1 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            SurveyUnitModel model2 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+
+            assertThat(model1).isEqualTo(model2);
+        }
+
+        @Test
+        @DisplayName("Two models with different interrogationId should not be equal")
+        void equals_differentInterrogationId_shouldBeFalse() {
+            SurveyUnitModel model1 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            SurveyUnitModel model2 = new SurveyUnitModel("other-id", mockMode);
+
+            assertThat(model1).isNotEqualTo(model2);
+        }
+
+        @Test
+        @DisplayName("Two models with different mode should not be equal")
+        void equals_differentMode_shouldBeFalse() {
+            SurveyUnitModel model1 = new SurveyUnitModel(INTERROGATION_ID, Mode.WEB);
+            SurveyUnitModel model2 = new SurveyUnitModel(INTERROGATION_ID, Mode.PAPER);
+
+            assertThat(model1).isNotEqualTo(model2);
+        }
+
+        @Test
+        @DisplayName("Equals should ignore other fields (e.g., usualSurveyUnitId)")
+        void equals_differentOtherFields_shouldStillBeEqual() {
+            SurveyUnitModel model1 = SurveyUnitModel.builder()
+                    .interrogationId(INTERROGATION_ID)
+                    .mode(mockMode)
+                    .usualSurveyUnitId("UE-A")
+                    .build();
+            SurveyUnitModel model2 = SurveyUnitModel.builder()
+                    .interrogationId(INTERROGATION_ID)
+                    .mode(mockMode)
+                    .usualSurveyUnitId("UE-B")
+                    .build();
+
+            assertThat(model1).isEqualTo(model2);
+        }
+
+        @Test
+        @DisplayName("Equals with null should return false")
+        void equals_null_shouldBeFalse() {
+            SurveyUnitModel model = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            assertThat(model).isNotEqualTo(null);
+        }
+
+        @Test
+        @DisplayName("Equals with different class should return false")
+        void equals_differentClass_shouldBeFalse() {
+            SurveyUnitModel model = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            assertThat(model).isNotEqualTo("a string");
+        }
+
+        @Test
+        @DisplayName("Two models with null interrogationId and null mode should be equal")
+        void equals_bothNullFields_shouldBeEqual() {
+            SurveyUnitModel model1 = new SurveyUnitModel();
+            SurveyUnitModel model2 = new SurveyUnitModel();
+
+            assertThat(model1).isEqualTo(model2);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // hashCode()
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("hashCode() tests")
+    class HashCodeTests {
+
+        @Test
+        @DisplayName("Same interrogationId and mode should produce the same hashCode")
+        void hashCode_sameFields_shouldBeEqual() {
+            SurveyUnitModel model1 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            SurveyUnitModel model2 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+
+            assertThat(model1).hasSameHashCodeAs(model2);
+        }
+
+        @Test
+        @DisplayName("Different interrogationId should (likely) produce different hashCode")
+        void hashCode_differentInterrogationId_shouldDiffer() {
+            SurveyUnitModel model1 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            SurveyUnitModel model2 = new SurveyUnitModel("completely-different-id", mockMode);
+
+            assertThat(model1.hashCode()).isNotEqualTo(model2.hashCode());
+        }
+
+        @Test
+        @DisplayName("hashCode should be consistent with equals")
+        void hashCode_consistentWithEquals() {
+            SurveyUnitModel model1 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            SurveyUnitModel model2 = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+
+            assertThat(model1).isEqualTo(model2).hasSameHashCodeAs(model2);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // toString() (generated by @Data)
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("toString() tests")
+    class ToStringTests {
+
+        @Test
+        @DisplayName("toString should contain interrogationId")
+        void toString_shouldContainInterrogationId() {
+            SurveyUnitModel model = new SurveyUnitModel(INTERROGATION_ID, mockMode);
+            assertThat(model.toString()).contains(INTERROGATION_ID);
+        }
+
+        @Test
+        @DisplayName("toString should not be null or empty")
+        void toString_shouldNotBeNullOrEmpty() {
+            SurveyUnitModel model = new SurveyUnitModel();
+            assertThat(model.toString()).isNotNull().isNotEmpty();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Deprecation awareness
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("Deprecated field (campaignId) tests")
+    class DeprecatedFieldTests {
+
+        @Test
+        @DisplayName("campaignId setter and getter should still function")
+        @SuppressWarnings("deprecation")
+        void campaignId_shouldBeSettableAndGettable() {
+            SurveyUnitModel model = new SurveyUnitModel();
+            model.setCampaignId(CAMPAIGN_ID);
+            assertThat(model.getCampaignId()).isEqualTo(CAMPAIGN_ID);
+        }
+
+        @Test
+        @DisplayName("campaignId via builder should still work")
+        @SuppressWarnings("deprecation")
+        void campaignId_viaBuilder_shouldWork() {
+            SurveyUnitModel model = SurveyUnitModel.builder()
+                    .campaignId(CAMPAIGN_ID)
+                    .build();
+            assertThat(model.getCampaignId()).isEqualTo(CAMPAIGN_ID);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/context/DataProcessingContextServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/context/DataProcessingContextServiceTest.java
deleted file mode 100644
index 1e911815..00000000
--- a/src/test/java/fr/insee/genesis/domain/service/context/DataProcessingContextServiceTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package fr.insee.genesis.domain.service.context;
-
-import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
-import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
-import fr.insee.genesis.domain.model.context.schedule.ServiceToCall;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.exceptions.GenesisException;
-import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class DataProcessingContextServiceTest {
-    //Given
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-    static DataProcessingContextService dataProcessingContextService;
-    static DataProcessingContextPersistancePortStub dataProcessingContextPersistencePortStub;
-    FileUtils fileUtils = new FileUtils(new ConfigStub());
-
-    @BeforeAll
-    static void init(){
-        dataProcessingContextPersistencePortStub = new DataProcessingContextPersistancePortStub();
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-
-        dataProcessingContextService = new DataProcessingContextService(dataProcessingContextPersistencePortStub, surveyUnitPersistencePortStub);
-    }
-
-    @BeforeEach
-    void reset(){
-        dataProcessingContextPersistencePortStub.getMongoStub().clear();
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-
-        List<KraftwerkExecutionSchedule> kraftwerkExecutionScheduleList = new ArrayList<>();
-        kraftwerkExecutionScheduleList.add(new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.MIN,
-                LocalDateTime.MAX,
-                null
-        ));
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setPartitionId("TEST");
-        doc.setCollectionInstrumentId("TEST");
-        doc.setKraftwerkExecutionScheduleList(kraftwerkExecutionScheduleList);
-        doc.setWithReview(false);
-        dataProcessingContextPersistencePortStub.getMongoStub().add(doc);
-    }
-
-    @Test
-    void getAllSchedules_test(){
-        //When + Then
-        Assertions.assertThat(dataProcessingContextService.getAllSchedules()).hasSize(1);
-    }
-
-    @Test
-    void saveKraftwerkExecutionSchedule_test_new_survey() throws GenesisException {
-        //When
-        dataProcessingContextService.saveKraftwerkExecutionSchedule("TEST2",
-                ServiceToCall.GENESIS,
-                "0 0 6 * * *",
-                LocalDateTime.MIN,
-                LocalDateTime.MAX,
-                null
-        );
-
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub()).hasSize(2);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getPartitionId()).isEqualTo("TEST2");
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getLastExecution()).isNull();
-
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getKraftwerkExecutionScheduleList()).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getKraftwerkExecutionScheduleList().getFirst().getFrequency()).isEqualTo("0 0 6 * * *");
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getKraftwerkExecutionScheduleList().getFirst().getScheduleBeginDate()).isEqualTo(LocalDateTime.MIN);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getKraftwerkExecutionScheduleList().getFirst().getScheduleEndDate()).isEqualTo(LocalDateTime.MAX);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getKraftwerkExecutionScheduleList().getFirst().getServiceToCall()).isEqualTo(ServiceToCall.GENESIS);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().get(1).getKraftwerkExecutionScheduleList().getFirst().getTrustParameters()).isNull();
-    }
-
-    @Test
-    void saveKraftwerkExecutionSchedule_test_old_survey() throws GenesisException {
-        //When
-        dataProcessingContextService.saveKraftwerkExecutionSchedule("TEST",
-                ServiceToCall.GENESIS,
-                "0 0 0 6 * *",
-                LocalDateTime.MIN,
-                LocalDateTime.MAX,
-                null
-        );
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getPartitionId()).isEqualTo("TEST");
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getLastExecution()).isNull();
-
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList()).hasSize(2);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList().get(1).getFrequency()).isEqualTo("0 0 0 6 * *");
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList().get(1).getScheduleBeginDate()).isEqualTo(LocalDateTime.MIN);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList().get(1).getScheduleEndDate()).isEqualTo(LocalDateTime.MAX);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList().get(1).getServiceToCall()).isEqualTo(ServiceToCall.GENESIS);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList().get(1).getTrustParameters()).isNull();
-    }
-
-    @Test
-    void deleteSchedule_test() throws GenesisException {
-        //When
-        dataProcessingContextService.deleteSchedules("TEST");
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub()).filteredOn(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TEST")
-        ).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().stream().filter(dataProcessingContextDocument ->
-                dataProcessingContextDocument.getPartitionId().equals("TEST")).toList().getFirst().getKraftwerkExecutionScheduleList()
-        ).isEmpty();
-    }
-
-    @Test
-    void updateLastExecutionName_test() throws GenesisException {
-        //Given
-        LocalDateTime localDateTime = LocalDateTime.now();
-
-        //When
-        dataProcessingContextService.updateLastExecutionDateByCollectionInstrumentId("TEST", localDateTime);
-
-        //Then
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getLastExecution()).isNotNull().isEqualTo(localDateTime);
-    }
-
-    @Test
-    void removeExpiredSchedules_test_existing_schedule() throws GenesisException {
-        //Given
-        //Expired schedule
-        dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList().add(new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.MIN,
-                LocalDateTime.of(2000,1,1,1,1,1),
-                null
-        ));
-
-        //When
-        dataProcessingContextService.deleteExpiredSchedules(fileUtils.getLogFolder());
-
-        //Then
-        //Execution schedule deleted
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList()).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().getFirst().getKraftwerkExecutionScheduleList().getFirst().getScheduleEndDate())
-                .isEqualTo(LocalDateTime.MAX);
-    }
-    @Test
-    void removeExpiredSchedules_test_delete_document() throws GenesisException {
-        //Given
-        //Expired schedule + new survey
-        List<KraftwerkExecutionSchedule> kraftwerkExecutionScheduleList = new ArrayList<>();
-        kraftwerkExecutionScheduleList.add(new KraftwerkExecutionSchedule(
-                "0 0 6 * * *",
-                ServiceToCall.MAIN,
-                LocalDateTime.MIN,
-                LocalDateTime.of(2000,1,1,1,1,1),
-                null
-        ));
-        DataProcessingContextDocument doc = new DataProcessingContextDocument();
-        doc.setCollectionInstrumentId("TEST2");
-        doc.setKraftwerkExecutionScheduleList(kraftwerkExecutionScheduleList);
-        doc.setWithReview(false);
-        dataProcessingContextPersistencePortStub.getMongoStub().add(doc);
-
-        //When
-        dataProcessingContextService.deleteExpiredSchedules(fileUtils.getLogFolder());
-
-        //Then
-        //Survey schedule document deleted
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub()).hasSize(2);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().stream().filter(
-                scheduleDocument -> scheduleDocument.getCollectionInstrumentId().equals("TEST2")
-        ).toList()).hasSize(1);
-        Assertions.assertThat(dataProcessingContextPersistencePortStub.getMongoStub().stream().filter(
-                scheduleDocument -> scheduleDocument.getCollectionInstrumentId().equals("TEST2")
-        ).toList().getFirst().getKraftwerkExecutionScheduleList()).isEmpty();
-
-    }
-
-    @Test
-    void getContext_shouldThrow500IfMultipleCollectionInstruments() {
-        // Given
-        SurveyUnitModel su1 = SurveyUnitModel.builder()
-                .collectionInstrumentId("CAMPAIGN1")
-                .interrogationId("00001")
-                .build();
-        SurveyUnitModel su2 = SurveyUnitModel.builder()
-                .collectionInstrumentId("CAMPAIGN2")
-                .interrogationId("00001")
-                .build();
-        List<SurveyUnitModel> sus = new ArrayList<>();
-        sus.add(su1);
-        sus.add(su2);
-        surveyUnitPersistencePortStub.saveAll(sus);
-
-        // When & Then
-        GenesisException ex = assertThrows(GenesisException.class, () -> dataProcessingContextService.getContext("00001"));
-        //To ensure test is portable on Unix/Linux/macOS and windows systems
-        String normalizedMessage = ex.getMessage().replaceAll("\\r?\\n", "");
-        Assertions.assertThat(ex.getStatus()).isEqualTo(500);
-        Assertions.assertThat(normalizedMessage).isEqualTo("Multiple collection instruments for interrogation 00001");
-    }
-
-    @Test
-    void getContext_shouldThrow404IfNoInterrogations() {
-        // When & Then
-        GenesisException ex = assertThrows(GenesisException.class, () -> dataProcessingContextService.getContext("00001"));
-        Assertions.assertThat(ex.getStatus()).isEqualTo(404);
-        Assertions.assertThat(ex.getMessage()).isEqualTo("No interrogation in database with id 00001");
-    }
-
-    @Test
-    void getContext_shouldReturnContextIfOneCollectionInstrument() throws GenesisException {
-        // Given
-        SurveyUnitModel su1 = SurveyUnitModel.builder()
-                .collectionInstrumentId("TEST")
-                .interrogationId("00001")
-                .build();
-        List<SurveyUnitModel> sus = new ArrayList<>();
-        sus.add(su1);
-        surveyUnitPersistencePortStub.saveAll(sus);
-        DataProcessingContextModel result = dataProcessingContextService.getContext("00001");
-
-        // When & Then
-        Assertions.assertThat(result).isNotNull();
-        Assertions.assertThat(result.getCollectionInstrumentId()).isEqualTo("TEST");
-        Assertions.assertThat(result.isWithReview()).isFalse();
-    }
-
-
-
-}
diff --git a/src/test/java/fr/insee/genesis/domain/service/context/DataProcessingContextServiceUnitTest.java b/src/test/java/fr/insee/genesis/domain/service/context/DataProcessingContextServiceUnitTest.java
index 97361104..d4d5e3cf 100644
--- a/src/test/java/fr/insee/genesis/domain/service/context/DataProcessingContextServiceUnitTest.java
+++ b/src/test/java/fr/insee/genesis/domain/service/context/DataProcessingContextServiceUnitTest.java
@@ -9,8 +9,13 @@
 import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
 import lombok.SneakyThrows;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,24 +24,55 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 class DataProcessingContextServiceUnitTest {
+    @Mock
+    private DataProcessingContextPersistancePort dataProcessingContextPersistancePort;
 
-    static DataProcessingContextService dataProcessingContextService;
-    static DataProcessingContextPersistancePort dataProcessingContextPersistancePort;
-    static SurveyUnitPersistencePort surveyUnitPersistencePort;
-
-    @BeforeEach
-    void setUp() {
-        dataProcessingContextPersistancePort = mock(DataProcessingContextPersistancePort.class);
-        surveyUnitPersistencePort = mock(SurveyUnitPersistencePort.class);
-        dataProcessingContextService = new DataProcessingContextService(
-                dataProcessingContextPersistancePort,
-                surveyUnitPersistencePort
+    @Mock
+    private SurveyUnitPersistencePort surveyUnitPersistencePort;
+
+    @InjectMocks
+    private DataProcessingContextService dataProcessingContextService;
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    @SneakyThrows
+    void saveContextByCollectionInstrumentId_test(boolean isNull) {
+        //GIVEN
+        if(!isNull){
+            DataProcessingContextModel dataProcessingContextModel = new DataProcessingContextModel();
+            doReturn(dataProcessingContextModel).when(dataProcessingContextPersistancePort)
+                    .findByCollectionInstrumentId(any());
+        }
+        String collectionInstrumentId = "collectionInstrumentId";
+        Boolean withReview = true;
+
+        //WHEN
+        dataProcessingContextService.saveContextByCollectionInstrumentId(collectionInstrumentId, withReview);
+
+        //THEN
+        verify(dataProcessingContextPersistancePort, times(1)).save(
+                any(DataProcessingContextDocument.class)
         );
     }
 
+    @Test
+    void countContext_test(){
+        //GIVEN
+        long expected = 5;
+        doReturn(expected).when(dataProcessingContextPersistancePort).count();
+
+        //WHEN
+        long actual = dataProcessingContextService.countContexts();
+
+        //THEN
+        Assertions.assertThat(actual).isEqualTo(expected);
+    }
+
     @Test
     @SneakyThrows
     void getContext_test() {
@@ -80,7 +116,7 @@ void getContext_no_surveyUnit_exception_test() {
 
     @Test
     @SneakyThrows
-    void getContext_multiple_CollectionInstruementIds_test() {
+    void getContext_multiple_CollectionInstrumentIds_test() {
         //GIVEN
         String collectionInstrumentId = TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
         String interrogationId = TestConstants.DEFAULT_INTERROGATION_ID;
@@ -98,11 +134,6 @@ void getContext_multiple_CollectionInstruementIds_test() {
         doReturn(surveyUnitModelList)
                 .when(surveyUnitPersistencePort)
                 .findByInterrogationId(any());
-        DataProcessingContextModel dataProcessingContextModel = DataProcessingContextModel.builder()
-                .collectionInstrumentId(collectionInstrumentId)
-                .withReview(true)
-                .build();
-        doReturn(dataProcessingContextModel).when(dataProcessingContextPersistancePort).findByCollectionInstrumentId(any());
 
         //WHEN + THEN
         Assertions.assertThatThrownBy(() ->
@@ -112,9 +143,8 @@ void getContext_multiple_CollectionInstruementIds_test() {
 
     @Test
     @SneakyThrows
-    void getContext_no_CollectionInstruementIds_test() {
+    void getContext_no_CollectionInstrumentIds_test() {
         //GIVEN
-        String collectionInstrumentId = TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
         String interrogationId = TestConstants.DEFAULT_INTERROGATION_ID;
         SurveyUnitModel surveyUnitModel = SurveyUnitModel.builder()
                 .interrogationId(interrogationId)
@@ -123,11 +153,6 @@ void getContext_no_CollectionInstruementIds_test() {
         doReturn(Collections.singletonList(surveyUnitModel))
                 .when(surveyUnitPersistencePort)
                 .findByInterrogationId(any());
-        DataProcessingContextModel dataProcessingContextModel = DataProcessingContextModel.builder()
-                .collectionInstrumentId(collectionInstrumentId)
-                .withReview(true)
-                .build();
-        doReturn(dataProcessingContextModel).when(dataProcessingContextPersistancePort).findByCollectionInstrumentId(any());
 
         //WHEN + THEN
         Assertions.assertThatThrownBy(() ->
@@ -135,6 +160,22 @@ void getContext_no_CollectionInstruementIds_test() {
                 .isInstanceOf(GenesisException.class);
     }
 
+    @Test
+    void getContextByCollectionInstrumentId_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        DataProcessingContextModel expected = new DataProcessingContextModel();
+        doReturn(expected).when(dataProcessingContextPersistancePort).findByCollectionInstrumentId(any());
+
+        //WHEN
+        DataProcessingContextModel actual = dataProcessingContextService.getContextByCollectionInstrumentId(collectionInstrumentId);
+
+        //THEN
+        verify(dataProcessingContextPersistancePort, times(1))
+                .findByCollectionInstrumentId(collectionInstrumentId);
+        Assertions.assertThat(actual).isEqualTo(expected);
+    }
+
     @Test
     void getCollectionInstrumentIdsWithReview_test() {
         //GIVEN
@@ -157,4 +198,35 @@ void getCollectionInstrumentIdsWithReview_test() {
         //THEN
         Assertions.assertThat(collectionInstrumentIds).containsExactly(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
     }
+
+    @Test
+    @SneakyThrows
+    void getReviewByCollectionInstrumentId_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        boolean withReview = true;
+        DataProcessingContextModel dataProcessingContextModel = DataProcessingContextModel.builder()
+                .collectionInstrumentId(collectionInstrumentId)
+                .withReview(withReview)
+                .build();
+        doReturn(dataProcessingContextModel).when(dataProcessingContextPersistancePort).findByCollectionInstrumentId(any());
+
+        //WHEN
+        boolean actual = dataProcessingContextService.getReviewByCollectionInstrumentId(collectionInstrumentId);
+
+        //THEN
+        verify(dataProcessingContextPersistancePort, times(1)).findByCollectionInstrumentId(collectionInstrumentId);
+        Assertions.assertThat(actual).isEqualTo(withReview);
+    }
+
+    @Test
+    void getReviewByCollectionInstrumentId_not_found_test() {
+        //WHEN + THEN
+        try{
+            dataProcessingContextService.getReviewByCollectionInstrumentId("collectionInstrumentId");
+            Assertions.fail();
+        }catch (GenesisException ge){
+            Assertions.assertThat(ge.getStatus()).isEqualTo(404);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonServiceTest.java
new file mode 100644
index 00000000..3196b6a7
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonServiceTest.java
@@ -0,0 +1,347 @@
+package fr.insee.genesis.domain.service.contextualvariable;
+
+import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.controller.dto.VariableQualityToolDto;
+import fr.insee.genesis.controller.dto.VariableStateDto;
+import fr.insee.genesis.domain.model.contextualvariable.ContextualExternalVariableModel;
+import fr.insee.genesis.domain.model.contextualvariable.ContextualPreviousVariableModel;
+import fr.insee.genesis.domain.model.contextualvariable.ContextualVariableModel;
+import fr.insee.genesis.domain.model.surveyunit.DataState;
+import fr.insee.genesis.domain.ports.api.ContextualExternalVariableApiPort;
+import fr.insee.genesis.domain.ports.api.ContextualPreviousVariableApiPort;
+import fr.insee.genesis.infrastructure.utils.FileUtils;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.util.FileSystemUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ContextualVariableJsonServiceTest {
+
+    private static final String TEST_FOLDER = "testContextual";
+    private static final Path TEST_FOLDER_PATH = Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, TEST_FOLDER);
+
+    @Mock
+    private ContextualPreviousVariableApiPort contextualPreviousVariableApiPort;
+
+    @Mock
+    private ContextualExternalVariableApiPort contextualExternalVariableApiPort;
+
+    @InjectMocks
+    ContextualVariableJsonService contextualVariableJsonService;
+
+    @BeforeEach
+    void setUp() throws IOException {
+        if (Files.exists(TEST_FOLDER_PATH)){
+            FileSystemUtils.deleteRecursively(TEST_FOLDER_PATH);
+        }
+        Files.createDirectories(TEST_FOLDER_PATH);
+        Files.createFile(TEST_FOLDER_PATH.resolve("ok.json"));
+        Files.createFile(TEST_FOLDER_PATH.resolve("ok2.json"));
+    }
+
+    @Test
+    void getContextualVariable_simple_variable_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String interrogationId = "test";
+        String testVariableName = "testVariable";
+
+        ContextualPreviousVariableModel contextualPreviousVariableModel = ContextualPreviousVariableModel
+                .builder()
+                .variables(new HashMap<>())
+                .build();
+        int value = 1;
+        contextualPreviousVariableModel.getVariables().put(testVariableName, value);
+        doReturn(contextualPreviousVariableModel).when(contextualPreviousVariableApiPort)
+                .findByCollectionInstrumentIdAndInterrogationId(
+                        collectionInstrumentId,
+                        interrogationId
+                );
+
+        ContextualExternalVariableModel contextualExternalVariableModel = ContextualExternalVariableModel
+                .builder()
+                .variables(new HashMap<>())
+                .build();
+        value = 2;
+        contextualExternalVariableModel.getVariables().put(testVariableName, value);
+        doReturn(contextualExternalVariableModel).when(contextualExternalVariableApiPort)
+                .findByCollectionInstrumentIdAndInterrogationId(
+                        collectionInstrumentId,
+                        interrogationId
+                );
+
+        //WHEN
+        ContextualVariableModel contextualVariableModel =
+                contextualVariableJsonService.getContextualVariable(collectionInstrumentId, interrogationId);
+
+        //THEN
+        Assertions.assertThat(contextualVariableModel).isNotNull();
+
+        //Previous
+        Assertions.assertThat(contextualVariableModel.contextualPrevious()).isNotNull().hasSize(1);
+        List<VariableQualityToolDto> variableQualityToolDtosPrevious = contextualVariableModel.contextualPrevious();
+        Assertions.assertThat(variableQualityToolDtosPrevious.getFirst().getVariableName())
+                .isEqualTo(testVariableName);
+        Assertions.assertThat(variableQualityToolDtosPrevious.getFirst().getIteration())
+                .isEqualTo(1);
+        Assertions.assertThat(variableQualityToolDtosPrevious.getFirst().getVariableStateDtoList())
+                .isNotNull().hasSize(1);
+        VariableStateDto variableStateDto = variableQualityToolDtosPrevious.getFirst().getVariableStateDtoList().getFirst();
+        Assertions.assertThat(variableStateDto.getState()).isEqualTo(DataState.COLLECTED);
+        Assertions.assertThat(variableStateDto.getValue()).isEqualTo(1);
+        Assertions.assertThat(variableStateDto.isActive()).isTrue();
+        Assertions.assertThat(variableStateDto.getDate()).isNotNull();
+
+        //External
+        Assertions.assertThat(contextualVariableModel.contextualExternal()).isNotNull().hasSize(1);
+        //Sort by iteration to avoid random order
+        List<VariableQualityToolDto> variableQualityToolDtosExternal = contextualVariableModel.contextualExternal();
+        Assertions.assertThat(variableQualityToolDtosExternal.getFirst().getVariableName())
+                .isEqualTo(testVariableName);
+        Assertions.assertThat(variableQualityToolDtosExternal.getFirst().getIteration())
+                .isEqualTo(1);
+        Assertions.assertThat(variableQualityToolDtosExternal.getFirst().getVariableStateDtoList())
+                .isNotNull().hasSize(1);
+        variableStateDto = variableQualityToolDtosExternal.getFirst().getVariableStateDtoList().getFirst();
+        Assertions.assertThat(variableStateDto.getState()).isEqualTo(DataState.COLLECTED);
+        Assertions.assertThat(variableStateDto.getValue()).isEqualTo(2);
+        Assertions.assertThat(variableStateDto.isActive()).isTrue();
+        Assertions.assertThat(variableStateDto.getDate()).isNotNull();
+    }
+
+    @Test
+    void getContextualVariable_extract_lists_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String interrogationId = "test";
+        String testListVarName = "testList";
+
+        ContextualPreviousVariableModel contextualPreviousVariableModel = ContextualPreviousVariableModel
+                .builder()
+                .variables(new HashMap<>())
+                .build();
+        List<Integer> contextualPreviousList = List.of(1,2);
+        contextualPreviousVariableModel.getVariables().put(testListVarName, contextualPreviousList);
+        doReturn(contextualPreviousVariableModel).when(contextualPreviousVariableApiPort)
+                .findByCollectionInstrumentIdAndInterrogationId(
+                        collectionInstrumentId,
+                        interrogationId
+                );
+
+
+        ContextualExternalVariableModel contextualExternalVariableModel = ContextualExternalVariableModel
+                .builder()
+                .variables(new HashMap<>())
+                .build();
+        List<Integer> contextualExternalList = List.of(3,4);
+        contextualExternalVariableModel.getVariables().put(testListVarName, contextualExternalList);
+        doReturn(contextualExternalVariableModel).when(contextualExternalVariableApiPort)
+                .findByCollectionInstrumentIdAndInterrogationId(
+                        collectionInstrumentId,
+                        interrogationId
+                );
+
+        //WHEN
+        ContextualVariableModel contextualVariableModel =
+                contextualVariableJsonService.getContextualVariable(collectionInstrumentId, interrogationId);
+
+        //THEN
+        Assertions.assertThat(contextualVariableModel).isNotNull();
+
+        //Previous
+        Assertions.assertThat(contextualVariableModel.contextualPrevious()).isNotNull().hasSize(2);
+        //Sort by iteration to avoid random order
+        List<VariableQualityToolDto> variableQualityToolDtosPrevious = contextualVariableModel.contextualPrevious()
+                .stream().sorted(
+                        Comparator.comparing(VariableQualityToolDto::getIteration)
+                ).toList();
+        Assertions.assertThat(variableQualityToolDtosPrevious.getFirst().getVariableName())
+                .isEqualTo(testListVarName);
+        Assertions.assertThat(variableQualityToolDtosPrevious.getFirst().getIteration())
+                .isEqualTo(1);
+        Assertions.assertThat(variableQualityToolDtosPrevious.getFirst().getVariableStateDtoList())
+                .isNotNull().hasSize(1);
+        VariableStateDto variableStateDto = variableQualityToolDtosPrevious.getFirst().getVariableStateDtoList().getFirst();
+        Assertions.assertThat(variableStateDto.getState()).isEqualTo(DataState.COLLECTED);
+        Assertions.assertThat(variableStateDto.getValue()).isEqualTo(1);
+        Assertions.assertThat(variableStateDto.isActive()).isTrue();
+        Assertions.assertThat(variableStateDto.getDate()).isNotNull();
+
+        Assertions.assertThat(variableQualityToolDtosPrevious.getLast().getVariableName())
+                .isEqualTo(testListVarName);
+        Assertions.assertThat(variableQualityToolDtosPrevious.getLast().getIteration())
+                .isEqualTo(2);
+        Assertions.assertThat(variableQualityToolDtosPrevious.getLast().getVariableStateDtoList())
+                .isNotNull().hasSize(1);
+        variableStateDto = variableQualityToolDtosPrevious.getLast().getVariableStateDtoList().getFirst();
+        Assertions.assertThat(variableStateDto.getState()).isEqualTo(DataState.COLLECTED);
+        Assertions.assertThat(variableStateDto.getValue()).isEqualTo(2);
+        Assertions.assertThat(variableStateDto.isActive()).isTrue();
+        Assertions.assertThat(variableStateDto.getDate()).isNotNull();
+
+        //External
+        Assertions.assertThat(contextualVariableModel.contextualExternal()).isNotNull().hasSize(2);
+        //Sort by iteration to avoid random order
+        List<VariableQualityToolDto> variableQualityToolDtosExternal = contextualVariableModel.contextualExternal()
+                .stream().sorted(
+                        Comparator.comparing(VariableQualityToolDto::getIteration)
+                ).toList();
+        Assertions.assertThat(variableQualityToolDtosExternal.getFirst().getVariableName())
+                .isEqualTo(testListVarName);
+        Assertions.assertThat(variableQualityToolDtosExternal.getFirst().getIteration())
+                .isEqualTo(1);
+        Assertions.assertThat(variableQualityToolDtosExternal.getFirst().getVariableStateDtoList())
+                .isNotNull().hasSize(1);
+        variableStateDto = variableQualityToolDtosExternal.getFirst().getVariableStateDtoList().getFirst();
+        Assertions.assertThat(variableStateDto.getState()).isEqualTo(DataState.COLLECTED);
+        Assertions.assertThat(variableStateDto.getValue()).isEqualTo(3);
+        Assertions.assertThat(variableStateDto.isActive()).isTrue();
+        Assertions.assertThat(variableStateDto.getDate()).isNotNull();
+
+        Assertions.assertThat(variableQualityToolDtosExternal.getLast().getVariableName())
+                .isEqualTo(testListVarName);
+        Assertions.assertThat(variableQualityToolDtosExternal.getLast().getIteration())
+                .isEqualTo(2);
+        Assertions.assertThat(variableQualityToolDtosExternal.getLast().getVariableStateDtoList())
+                .isNotNull().hasSize(1);
+        variableStateDto = variableQualityToolDtosExternal.getLast().getVariableStateDtoList().getFirst();
+        Assertions.assertThat(variableStateDto.getState()).isEqualTo(DataState.COLLECTED);
+        Assertions.assertThat(variableStateDto.getValue()).isEqualTo(4);
+        Assertions.assertThat(variableStateDto.isActive()).isTrue();
+        Assertions.assertThat(variableStateDto.getDate()).isNotNull();
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true}) //false if only external, true if only previous
+    void getContextualVariable_only_one_model_test(boolean onlyPrevious) {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String interrogationId = "test";
+        String testVariableName = "testVariable";
+
+        if(onlyPrevious){
+            ContextualPreviousVariableModel contextualPreviousVariableModel = ContextualPreviousVariableModel
+                    .builder()
+                    .variables(new HashMap<>())
+                    .build();
+            int value = 1;
+            contextualPreviousVariableModel.getVariables().put(testVariableName, value);
+            doReturn(contextualPreviousVariableModel).when(contextualPreviousVariableApiPort)
+                    .findByCollectionInstrumentIdAndInterrogationId(
+                            collectionInstrumentId,
+                            interrogationId
+                    );
+        }else{
+            ContextualExternalVariableModel contextualExternalVariableModel = ContextualExternalVariableModel
+                    .builder()
+                    .variables(new HashMap<>())
+                    .build();
+            int value = 2;
+            contextualExternalVariableModel.getVariables().put(testVariableName, value);
+            doReturn(contextualExternalVariableModel).when(contextualExternalVariableApiPort)
+                    .findByCollectionInstrumentIdAndInterrogationId(
+                            collectionInstrumentId,
+                            interrogationId
+                    );
+        }
+
+        //WHEN
+        ContextualVariableModel contextualVariableModel =
+                contextualVariableJsonService.getContextualVariable(collectionInstrumentId, interrogationId);
+
+        //THEN
+        if(onlyPrevious){
+            Assertions.assertThat(contextualVariableModel.contextualExternal()).isNotNull().isEmpty();
+            Assertions.assertThat(contextualVariableModel.contextualPrevious()).isNotNull().hasSize(1);
+        }else{
+            Assertions.assertThat(contextualVariableModel.contextualPrevious()).isNotNull().isEmpty();
+            Assertions.assertThat(contextualVariableModel.contextualExternal()).isNotNull().hasSize(1);
+        }
+    }
+
+    @Test
+    void getContextualVariable_null_model_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String interrogationId = "test";
+
+        //WHEN
+        ContextualVariableModel contextualVariableModel =
+                contextualVariableJsonService.getContextualVariable(collectionInstrumentId, interrogationId);
+
+        //THEN
+            Assertions.assertThat(contextualVariableModel.contextualExternal()).isNotNull().isEmpty();
+            Assertions.assertThat(contextualVariableModel.contextualPrevious()).isNotNull().isEmpty();
+    }
+
+    @Test
+    @SneakyThrows
+    void saveContextualVariableFiles() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        FileUtils fileUtils = mock(FileUtils.class);
+        List<Path> pathList = List.of(
+                Path.of("ok.json"),
+                Path.of("ok2.json")
+        );
+        String doneFolder = "testDone";
+        doReturn(doneFolder).when(fileUtils).getDoneFolder(anyString(),anyString());
+        doReturn(pathList).when(fileUtils).listFiles(anyString());
+        doReturn(true).when(contextualPreviousVariableApiPort)
+                .readContextualPreviousFile(any(), any(), any());
+        doReturn(true).when(contextualExternalVariableApiPort)
+                .readContextualExternalFile(any(), any());
+        doAnswer(invocation ->
+                Files.deleteIfExists(invocation.getArgument(0))
+        ).when(fileUtils).moveFiles(any(Path.class), any());
+
+        //WHEN
+        int fileCount = contextualVariableJsonService.saveContextualVariableFiles(
+                collectionInstrumentId,
+                fileUtils,
+                TEST_FOLDER_PATH.toString()
+                );
+
+        //THEN
+        Assertions.assertThat(fileCount).isEqualTo(pathList.size());
+        verify(fileUtils, times(pathList.size())).moveFiles(
+                any(),
+                eq(doneFolder)
+        );
+    }
+
+    @AfterEach
+    void clean() throws IOException {
+        if (Files.exists(TEST_FOLDER_PATH)){
+            FileSystemUtils.deleteRecursively(TEST_FOLDER_PATH);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/contextualvariable/external/ContextualExternalVariableJsonServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/contextualvariable/external/ContextualExternalVariableJsonServiceTest.java
new file mode 100644
index 00000000..7ef351ff
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/service/contextualvariable/external/ContextualExternalVariableJsonServiceTest.java
@@ -0,0 +1,155 @@
+package fr.insee.genesis.domain.service.contextualvariable.external;
+
+import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.domain.model.contextualvariable.ContextualExternalVariableModel;
+import fr.insee.genesis.domain.ports.spi.ContextualExternalVariablePersistancePort;
+import fr.insee.genesis.exceptions.GenesisException;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.nio.file.Path;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class ContextualExternalVariableJsonServiceTest {
+
+    @Mock
+    ContextualExternalVariablePersistancePort contextualExternalVariablePersistancePort;
+
+    @InjectMocks
+    ContextualExternalVariableJsonService contextualExternalVariableJsonService;
+
+    @Test
+    @SneakyThrows
+    void readContextualExternalFile_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+            TestConstants.TEST_RESOURCES_DIRECTORY,
+            "contextual_external",
+            "ok.json"
+        ).toString();
+
+        //WHEN
+        boolean isOK = contextualExternalVariableJsonService.readContextualExternalFile(
+          collectionInstrumentId,
+          filePath
+        );
+
+        //THEN
+        Assertions.assertThat(isOK).isTrue();
+        verify(contextualExternalVariablePersistancePort, times(1)).backup(collectionInstrumentId);
+        verify(contextualExternalVariablePersistancePort, times(1)).saveAll(anyList());
+        verify(contextualExternalVariablePersistancePort, times(1)).deleteBackup(collectionInstrumentId);
+        verify(contextualExternalVariablePersistancePort, times(1)).delete(collectionInstrumentId);
+
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualExternalFile_no_external_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_previous",
+                "ok.json"
+        ).toString();
+
+        //WHEN
+        boolean isOK = contextualExternalVariableJsonService.readContextualExternalFile(
+                collectionInstrumentId,
+                filePath
+        );
+
+        //THEN
+        Assertions.assertThat(isOK).isFalse();
+        verify(contextualExternalVariablePersistancePort, times(1)).backup(collectionInstrumentId);
+        verify(contextualExternalVariablePersistancePort, times(1)).delete(collectionInstrumentId);
+        verify(contextualExternalVariablePersistancePort, never()).saveAll(anyList());
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualExternalFile_jsonParseException_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_external",
+                "invalid_syntax.json"
+        ).toString();
+
+        //WHEN + THEN
+        try{
+            contextualExternalVariableJsonService.readContextualExternalFile(
+                    collectionInstrumentId,
+                    filePath
+            );
+            Assertions.fail();
+        }catch (GenesisException ge){
+            Assertions.assertThat(ge.getStatus()).isEqualTo(400);
+            verify(contextualExternalVariablePersistancePort, times(1)).backup(collectionInstrumentId);
+            verify(contextualExternalVariablePersistancePort, times(1)).delete(collectionInstrumentId);
+            verify(contextualExternalVariablePersistancePort, times(1)).restoreBackup(collectionInstrumentId);
+            verify(contextualExternalVariablePersistancePort, never()).saveAll(anyList());
+        }
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualExternalFile_IOException_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_external",
+                "hgfhfghgfhfg"
+        ).toString();
+
+        //WHEN + THEN
+        try{
+            contextualExternalVariableJsonService.readContextualExternalFile(
+                    collectionInstrumentId,
+                    filePath
+            );
+            Assertions.fail();
+        }catch (GenesisException ge){
+            Assertions.assertThat(ge.getStatus()).isEqualTo(500);
+            verify(contextualExternalVariablePersistancePort, never()).saveAll(anyList());
+            verify(contextualExternalVariablePersistancePort, times(1)).restoreBackup(collectionInstrumentId);
+        }
+    }
+
+    @Test
+    void findByCollectionInstrumentIdAndInterrogationId_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String interrogationId = "test2";
+        ContextualExternalVariableModel expected = ContextualExternalVariableModel.builder().build();
+        doReturn(expected).when(contextualExternalVariablePersistancePort)
+                .findByCollectionInstrumentIdAndInterrogationId(any(), any());
+
+        //WHEN
+        ContextualExternalVariableModel actual = contextualExternalVariableJsonService.findByCollectionInstrumentIdAndInterrogationId(
+            collectionInstrumentId,
+            interrogationId
+        );
+
+        //THEN
+        verify(contextualExternalVariablePersistancePort, times(1))
+                .findByCollectionInstrumentIdAndInterrogationId(collectionInstrumentId, interrogationId);
+        Assertions.assertThat(actual).isEqualTo(expected);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/contextualvariable/previous/ContextualPreviousVariableJsonServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/contextualvariable/previous/ContextualPreviousVariableJsonServiceTest.java
new file mode 100644
index 00000000..61a0b199
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/service/contextualvariable/previous/ContextualPreviousVariableJsonServiceTest.java
@@ -0,0 +1,187 @@
+package fr.insee.genesis.domain.service.contextualvariable.previous;
+
+import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.domain.model.contextualvariable.ContextualPreviousVariableModel;
+import fr.insee.genesis.domain.ports.spi.ContextualPreviousVariablePersistancePort;
+import fr.insee.genesis.exceptions.GenesisException;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.nio.file.Path;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+@ExtendWith(MockitoExtension.class)
+class ContextualPreviousVariableJsonServiceTest {
+
+    @Mock
+    ContextualPreviousVariablePersistancePort contextualPreviousVariablePersistancePort;
+
+    @InjectMocks
+    ContextualPreviousVariableJsonService contextualPreviousVariableJsonService;
+
+    @Test
+    @SneakyThrows
+    void readContextualPreviousFile_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_previous",
+                "ok.json"
+        ).toString();
+        String sourceState = "test2";
+
+        //WHEN
+        boolean isOK = contextualPreviousVariableJsonService.readContextualPreviousFile(
+                collectionInstrumentId,
+                sourceState,
+                filePath
+        );
+
+        //THEN
+        Assertions.assertThat(isOK).isTrue();
+        verify(contextualPreviousVariablePersistancePort, times(1)).backup(collectionInstrumentId);
+        verify(contextualPreviousVariablePersistancePort, times(1)).saveAll(anyList());
+        verify(contextualPreviousVariablePersistancePort, times(1)).deleteBackup(collectionInstrumentId);
+        verify(contextualPreviousVariablePersistancePort, times(1)).delete(collectionInstrumentId);
+
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualPreviousFile_no_previous_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_external",
+                "ok.json"
+        ).toString();
+
+        //WHEN
+        boolean isOK = contextualPreviousVariableJsonService.readContextualPreviousFile(
+                collectionInstrumentId,
+                null,
+                filePath
+        );
+
+        //THEN
+        Assertions.assertThat(isOK).isFalse();
+        verify(contextualPreviousVariablePersistancePort, times(1)).backup(collectionInstrumentId);
+        verify(contextualPreviousVariablePersistancePort, times(1)).delete(collectionInstrumentId);
+        verify(contextualPreviousVariablePersistancePort, never()).saveAll(anyList());
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualPreviousFile_sourcestate_too_long_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_external",
+                "ok.json"
+        ).toString();
+        String sourceState = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+
+        //WHEN + THEN
+        try{
+            contextualPreviousVariableJsonService.readContextualPreviousFile(
+                    collectionInstrumentId,
+                    sourceState,
+                    filePath
+            );
+            Assertions.fail();
+        }catch (GenesisException ge){
+            Assertions.assertThat(ge.getStatus()).isEqualTo(400);
+            verifyNoInteractions(contextualPreviousVariablePersistancePort);
+        }
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualPreviousFile_jsonParseException_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_previous",
+                "invalid_syntax.json"
+        ).toString();
+
+        //WHEN + THEN
+        try{
+            contextualPreviousVariableJsonService.readContextualPreviousFile(
+                    collectionInstrumentId,
+                    null,
+                    filePath
+            );
+            Assertions.fail();
+        }catch (GenesisException ge){
+            Assertions.assertThat(ge.getStatus()).isEqualTo(400);
+            verify(contextualPreviousVariablePersistancePort, times(1)).backup(collectionInstrumentId);
+            verify(contextualPreviousVariablePersistancePort, times(1)).delete(collectionInstrumentId);
+            verify(contextualPreviousVariablePersistancePort, times(1)).restoreBackup(collectionInstrumentId);
+            verify(contextualPreviousVariablePersistancePort, never()).saveAll(anyList());
+        }
+    }
+
+    @Test
+    @SneakyThrows
+    void readContextualPreviousFile_IOException_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String filePath = Path.of(
+                TestConstants.TEST_RESOURCES_DIRECTORY,
+                "contextual_previous",
+                "hgfhfghgfhfg"
+        ).toString();
+
+        //WHEN + THEN
+        try{
+            contextualPreviousVariableJsonService.readContextualPreviousFile(
+                    collectionInstrumentId,
+                    null,
+                    filePath
+            );
+            Assertions.fail();
+        }catch (GenesisException ge){
+            Assertions.assertThat(ge.getStatus()).isEqualTo(500);
+            verify(contextualPreviousVariablePersistancePort, never()).saveAll(anyList());
+            verify(contextualPreviousVariablePersistancePort, times(1)).restoreBackup(collectionInstrumentId);
+        }
+    }
+
+    @Test
+    void findByCollectionInstrumentIdAndInterrogationId_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        String interrogationId = "test2";
+        ContextualPreviousVariableModel expected = ContextualPreviousVariableModel.builder().build();
+        doReturn(expected).when(contextualPreviousVariablePersistancePort)
+                .findByCollectionInstrumentIdAndInterrogationId(any(), any());
+
+        //WHEN
+        ContextualPreviousVariableModel actual = contextualPreviousVariableJsonService.findByCollectionInstrumentIdAndInterrogationId(
+                collectionInstrumentId,
+                interrogationId
+        );
+
+        //THEN
+        verify(contextualPreviousVariablePersistancePort, times(1))
+                .findByCollectionInstrumentIdAndInterrogationId(collectionInstrumentId, interrogationId);
+        Assertions.assertThat(actual).isEqualTo(expected);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/extraction/LastJsonExtractionServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/extraction/LastJsonExtractionServiceTest.java
new file mode 100644
index 00000000..7fc1ff9a
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/service/extraction/LastJsonExtractionServiceTest.java
@@ -0,0 +1,104 @@
+package fr.insee.genesis.domain.service.extraction;
+
+import fr.insee.genesis.domain.model.extraction.json.LastJsonExtractionModel;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.ports.spi.LastJsonExtractionPersistencePort;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class LastJsonExtractionServiceTest {
+
+    @Mock
+    LastJsonExtractionPersistencePort lastJsonExtractionPersistencePort;
+
+    @InjectMocks
+    LastJsonExtractionService lastJsonExtractionService;
+
+    @Captor
+    ArgumentCaptor<LastJsonExtractionModel> lastJsonExtractionModelArgumentCaptor;
+
+    @Test
+    void recordDate_test() {
+        //GIVEN
+        LastJsonExtractionModel lastJsonExtractionModel = LastJsonExtractionModel.builder().build();
+        lastJsonExtractionModel.setCollectionInstrumentId("test");
+        lastJsonExtractionModel.setMode(Mode.WEB);
+
+        //WHEN
+        lastJsonExtractionService.recordDate(lastJsonExtractionModel);
+
+        //THEY
+        verify(lastJsonExtractionPersistencePort, times(1))
+                .save(lastJsonExtractionModelArgumentCaptor.capture());
+        Assertions.assertThat(lastJsonExtractionModelArgumentCaptor.getValue()).isNotNull();
+        Assertions.assertThat(lastJsonExtractionModelArgumentCaptor.getValue().getId())
+                .isNotNull().isEqualTo(String.format("%s_%s"
+                        ,lastJsonExtractionModel.getCollectionInstrumentId()
+                        ,lastJsonExtractionModel.getMode()));
+    }
+
+    @Test
+    @SneakyThrows
+    void getLastExtractionDate_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+        LastJsonExtractionModel expected = LastJsonExtractionModel.builder().build();
+        doReturn(expected).when(lastJsonExtractionPersistencePort).getLastExecutionDate(anyString(), any());
+
+        //WHEN + THEN
+        Assertions.assertThat(lastJsonExtractionService.getLastExtractionDate(
+                collectionInstrumentId, mode
+                )).isEqualTo(expected);
+        verify(lastJsonExtractionPersistencePort, times(1))
+                .getLastExecutionDate(collectionInstrumentId, mode);
+    }
+
+    @Test
+    @SneakyThrows
+    void delete_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+
+        //WHEN
+        lastJsonExtractionService.delete(collectionInstrumentId, mode);
+
+        //THEN
+        verify(lastJsonExtractionPersistencePort, times(1))
+                .getLastExecutionDate(collectionInstrumentId, mode);
+        verify(lastJsonExtractionPersistencePort, times(1))
+                .delete(collectionInstrumentId, mode);
+        }
+
+    @Test
+    @SneakyThrows
+    void delete_null_mode_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+
+        //WHEN
+        lastJsonExtractionService.delete(collectionInstrumentId, null);
+
+        //THEN
+        verify(lastJsonExtractionPersistencePort, never())
+                .getLastExecutionDate(collectionInstrumentId, null);
+        verify(lastJsonExtractionPersistencePort, times(1))
+                .delete(collectionInstrumentId, null);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/lunaticmodel/LunaticModelServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/lunaticmodel/LunaticModelServiceTest.java
new file mode 100644
index 00000000..ef08acd7
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/service/lunaticmodel/LunaticModelServiceTest.java
@@ -0,0 +1,103 @@
+package fr.insee.genesis.domain.service.lunaticmodel;
+
+import fr.insee.genesis.domain.model.lunaticmodel.LunaticModelModel;
+import fr.insee.genesis.domain.ports.spi.LunaticModelPersistancePort;
+import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.infrastructure.document.lunaticmodel.LunaticModelDocument;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class LunaticModelServiceTest {
+
+    @Mock
+    LunaticModelPersistancePort lunaticModelPersistancePort;
+
+    @InjectMocks
+    LunaticModelService lunaticModelService;
+
+    @Captor
+    ArgumentCaptor<LunaticModelModel> lunaticModelModelArgumentCaptor;
+
+    @Test
+    void save_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Map<String, Object> lunaticModel = new HashMap<>();
+
+        //WHEN
+        lunaticModelService.save(collectionInstrumentId, lunaticModel);
+
+        //THEN
+        verify(lunaticModelPersistancePort, times(1))
+                .save(lunaticModelModelArgumentCaptor.capture());
+        Assertions.assertThat(lunaticModelModelArgumentCaptor.getValue()).isNotNull();
+        Assertions.assertThat(lunaticModelModelArgumentCaptor.getValue().collectionInstrumentId())
+                .isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(lunaticModelModelArgumentCaptor.getValue().lunaticModel())
+                .isEqualTo(lunaticModel);
+        Assertions.assertThat(lunaticModelModelArgumentCaptor.getValue().recordDate())
+                .isNotNull();
+    }
+
+    @Test
+    @SneakyThrows
+    void get_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        LocalDateTime recordDate = LocalDateTime.now();
+
+        LunaticModelDocument expected = LunaticModelDocument.builder()
+                .collectionInstrumentId(collectionInstrumentId)
+                .recordDate(recordDate)
+                .lunaticModel(new HashMap<>())
+                .build();
+        String lunaticModelKey = "testKey";
+        int lunaticModelValue = 1;
+        expected.lunaticModel().put(lunaticModelKey, lunaticModelValue);
+        doReturn(List.of(expected)).when(lunaticModelPersistancePort).find(any());
+
+        //WHEN
+        LunaticModelModel actual = lunaticModelService.get(collectionInstrumentId);
+
+        //THEN
+        Assertions.assertThat(actual).isNotNull();
+        Assertions.assertThat(actual.collectionInstrumentId()).isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(actual.recordDate()).isEqualTo(recordDate);
+        Assertions.assertThat(actual.lunaticModel()).isNotNull().containsEntry(
+                lunaticModelKey, lunaticModelValue
+        );
+    }
+
+    @Test
+    void get_not_found_test() {
+        //GIVEN
+        doReturn(new ArrayList<>()).when(lunaticModelPersistancePort).find(any());
+
+        //WHEN + THEN
+        try{
+            lunaticModelService.get("test");
+            Assertions.fail();
+        }catch (GenesisException ge){
+            Assertions.assertThat(ge.getStatus()).isEqualTo(404);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataServiceTest.java
new file mode 100644
index 00000000..4e17f556
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataServiceTest.java
@@ -0,0 +1,200 @@
+package fr.insee.genesis.domain.service.metadata;
+
+import fr.insee.bpm.metadata.model.MetadataModel;
+import fr.insee.bpm.metadata.model.Variable;
+import fr.insee.bpm.metadata.model.VariableType;
+import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.domain.model.metadata.QuestionnaireMetadataModel;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.ports.spi.QuestionnaireMetadataPersistencePort;
+import fr.insee.genesis.exceptions.GenesisError;
+import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.infrastructure.utils.FileUtils;
+import lombok.SneakyThrows;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class QuestionnaireMetadataServiceTest {
+
+    @Mock
+    QuestionnaireMetadataPersistencePort questionnaireMetadataPersistencePort;
+
+    @InjectMocks
+    QuestionnaireMetadataService questionnaireMetadataService;
+
+    @Captor
+    ArgumentCaptor<QuestionnaireMetadataModel> questionnaireMetadataModelArgumentCaptor;
+
+    @Test
+    @SneakyThrows
+    void find_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+        MetadataModel metadataModel = new MetadataModel();
+        QuestionnaireMetadataModel questionnaireMetadataModel = QuestionnaireMetadataModel.builder()
+                .metadataModel(metadataModel)
+                .build();
+        doReturn(List.of(questionnaireMetadataModel)).when(questionnaireMetadataPersistencePort).find(
+                any(), any()
+        );
+
+        //WHEN
+        MetadataModel actual = questionnaireMetadataService.find(collectionInstrumentId, mode);
+
+        //THEN
+        verify(questionnaireMetadataPersistencePort, times(1))
+                .find(collectionInstrumentId, mode);
+        Assertions.assertThat(actual).isEqualTo(metadataModel);
+    }
+
+    @Test
+    void find_not_found_test() {
+        //GIVEN
+        doReturn(new ArrayList<>()).when(questionnaireMetadataPersistencePort).find(
+                any(), any()
+        );
+
+        try{
+            //WHEN
+            questionnaireMetadataService.find("test", Mode.WEB);
+            Assertions.fail();
+        }catch (GenesisException ge){
+            //THEN
+            Assertions.assertThat(ge.getStatus()).isEqualTo(404);
+        }
+    }
+
+    @Test
+    @SneakyThrows
+    void loadAndSaveIfNotExists_not_exists_test() {
+        //GIVEN
+        String collectionInstrumentId = TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+        Mode mode = Mode.WEB;
+        doReturn(new ArrayList<>()).when(questionnaireMetadataPersistencePort).find(
+                any(), any()
+        );
+        FileUtils fileUtils = new FileUtils(TestConstants.getConfigStub());
+        ArrayList<GenesisError> errors = new ArrayList<>();
+
+        //WHEN
+        MetadataModel actual = questionnaireMetadataService.loadAndSaveIfNotExists(null,
+                collectionInstrumentId,
+                mode,
+                fileUtils,
+                errors
+        );
+
+        //THEN
+        verify(questionnaireMetadataPersistencePort, times(1))
+                .find(collectionInstrumentId.toUpperCase(), mode);
+        Assertions.assertThat(actual).isNotNull();
+        Assertions.assertThat(actual.getVariables()).isNotNull();
+        Assertions.assertThat(actual.getVariables().getVariables()).isNotNull().isNotEmpty();
+        verify(questionnaireMetadataPersistencePort, times(1))
+                .save(questionnaireMetadataModelArgumentCaptor.capture());
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue()).isNotNull();
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue().collectionInstrumentId())
+                .isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue().mode())
+                .isEqualTo(mode);
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue().metadataModel())
+                .isEqualTo(actual);
+        Assertions.assertThat(errors).isEmpty();
+    }
+
+    @Test
+    @SneakyThrows
+    void loadAndSaveIfNotExists_already_exists_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+        MetadataModel metadataModel = new MetadataModel();
+        metadataModel.getVariables().putVariable(new Variable(
+                "testVar",
+                metadataModel.getRootGroup(),
+                VariableType.STRING
+        ));
+        QuestionnaireMetadataModel questionnaireMetadataModel = QuestionnaireMetadataModel.builder()
+                .metadataModel(metadataModel)
+                .build();
+        doReturn(List.of(questionnaireMetadataModel)).when(questionnaireMetadataPersistencePort).find(
+                any(), any()
+        );
+        ArrayList<GenesisError> errors = new ArrayList<>();
+
+        //WHEN
+        MetadataModel actual = questionnaireMetadataService.loadAndSaveIfNotExists(null,
+                collectionInstrumentId,
+                mode,
+                mock(FileUtils.class),
+                new ArrayList<>()
+        );
+
+        //THEN
+        verify(questionnaireMetadataPersistencePort, times(1))
+                .find(collectionInstrumentId.toUpperCase(), mode);
+        Assertions.assertThat(actual).isNotNull();
+        Assertions.assertThat(actual.getVariables()).isNotNull();
+        Assertions.assertThat(actual.getVariables().getVariables()).isNotNull().isNotEmpty();
+        verify(questionnaireMetadataPersistencePort, never())
+                .save(any());
+        Assertions.assertThat(errors).isEmpty();
+    }
+
+    @Test
+    void remove_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+
+        //WHEN
+        questionnaireMetadataService.remove(collectionInstrumentId, mode);
+
+        //THEN
+        verify(questionnaireMetadataPersistencePort, times(1))
+                .remove(collectionInstrumentId, mode);
+    }
+
+    @Test
+    void save_test() {
+        //GIVEN
+        String collectionInstrumentId = "test";
+        Mode mode = Mode.WEB;
+        MetadataModel metadataModel = new MetadataModel();
+
+        //WHEN
+        questionnaireMetadataService.save(collectionInstrumentId, mode, metadataModel);
+
+        //THEN
+        verify(questionnaireMetadataPersistencePort, times(1))
+                .save(questionnaireMetadataModelArgumentCaptor.capture());
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue()).isNotNull();
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue().collectionInstrumentId())
+                .isEqualTo(collectionInstrumentId);
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue().mode())
+                .isEqualTo(mode);
+        Assertions.assertThat(questionnaireMetadataModelArgumentCaptor.getValue().metadataModel())
+                .isEqualTo(metadataModel);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataServiceTest.java
index 13dd3925..b47363ad 100644
--- a/src/test/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataServiceTest.java
+++ b/src/test/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataServiceTest.java
@@ -35,8 +35,6 @@ class CombinedRawDataServiceTest {
     void getCombinedRawDataByInterrogationId_shouldReturnCombinedData() {
         // GIVEN
         String interrogationId = "INTERROGATION_1";
-
-        // Mock des RawResponses
         RawResponseModel response1 = new RawResponseModel(
                 new ObjectId(),
                 interrogationId,
@@ -46,7 +44,6 @@ void getCombinedRawDataByInterrogationId_shouldReturnCombinedData() {
                 LocalDateTime.now(),
                 null
         );
-
         RawResponseModel response2 = new RawResponseModel(
                 new ObjectId(),
                 interrogationId,
@@ -56,10 +53,10 @@ void getCombinedRawDataByInterrogationId_shouldReturnCombinedData() {
                 LocalDateTime.now(),
                 null
         );
-
         List<RawResponseModel> rawResponseModels = List.of(response1, response2);
+        Mockito.when(rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId))
+                .thenReturn(rawResponseModels);
 
-        // Mock des LunaticJsonRawData
         LunaticJsonRawDataModel lunatic1 = LunaticJsonRawDataModel.builder()
                 .campaignId("CAMPAIGN")
                 .questionnaireId("QUESTIONNAIRE")
@@ -68,14 +65,10 @@ void getCombinedRawDataByInterrogationId_shouldReturnCombinedData() {
                 .mode(Mode.WEB)
                 .build();
         List<LunaticJsonRawDataModel> lunaticRawData = List.of(lunatic1);
-
-        // WHEN
-        Mockito.when(rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId))
-                .thenReturn(rawResponseModels);
-
-        Mockito.when(lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId))
+        Mockito.when(lunaticJsonRawDataPersistencePort.findRawDataByInterrogationId(interrogationId))
                 .thenReturn(lunaticRawData);
 
+        // WHEN
         CombinedRawDataDto result = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
 
         // THEN - assertions
@@ -85,14 +78,17 @@ void getCombinedRawDataByInterrogationId_shouldReturnCombinedData() {
 
     @Test
     void getCombinedRawData_shouldHandleEmptyLists() {
+        //GIVEN
         String interrogationId = "INTERROGATION_EMPTY";
-
         Mockito.when(rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId))
                 .thenReturn(List.of());
-        Mockito.when(lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId))
+        Mockito.when(lunaticJsonRawDataPersistencePort.findRawDataByInterrogationId(interrogationId))
                 .thenReturn(List.of());
+
+        //WHEN
         CombinedRawDataDto result = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
 
+        //THEN
         Assertions.assertThat(result.rawResponseModels()).isEmpty();
         Assertions.assertThat(result.lunaticRawDataModels()).isEmpty();
     }
diff --git a/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceTest.java
deleted file mode 100644
index 09c6049e..00000000
--- a/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceTest.java
+++ /dev/null
@@ -1,695 +0,0 @@
-package fr.insee.genesis.domain.service.rawdata;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import fr.insee.bpm.metadata.model.VariablesMap;
-import fr.insee.genesis.controller.utils.ControllerUtils;
-import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.model.surveyunit.VariableModel;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
-import fr.insee.genesis.domain.service.context.DataProcessingContextService;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
-import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
-import fr.insee.genesis.domain.utils.JsonUtils;
-import fr.insee.genesis.infrastructure.mappers.DataProcessingContextMapper;
-import fr.insee.genesis.infrastructure.mappers.LunaticJsonRawDataDocumentMapper;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
-import fr.insee.genesis.stubs.LunaticJsonRawDataPersistanceStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitQualityToolPerretAdapterStub;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static fr.insee.genesis.domain.service.rawdata.LunaticJsonRawDataService.getValueString;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-class LunaticJsonRawDataServiceTest {
-    LunaticJsonRawDataPersistanceStub lunaticJsonRawDataPersistanceStub = new LunaticJsonRawDataPersistanceStub();
-    FileUtils fileUtils = new FileUtils(new ConfigStub());
-    ControllerUtils controllerUtils = new ControllerUtils(fileUtils);
-
-    static QuestionnaireMetadataService metadataService =
-            new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub());
-
-    SurveyUnitPersistencePortStub surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-    DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub = new DataProcessingContextPersistancePortStub();
-    SurveyUnitQualityToolPerretAdapterStub surveyUnitQualityToolPerretAdapterStub = new SurveyUnitQualityToolPerretAdapterStub();
-    ConfigStub configStub = new ConfigStub();
-    LunaticJsonRawDataService lunaticJsonRawDataService =
-            new LunaticJsonRawDataService(
-                    lunaticJsonRawDataPersistanceStub,
-                    controllerUtils,
-                    metadataService,
-                    new SurveyUnitService(surveyUnitPersistencePortStub, metadataService, fileUtils),
-                    new SurveyUnitQualityService(),
-                    fileUtils,
-                    new DataProcessingContextService(dataProcessingContextPersistancePortStub, surveyUnitPersistencePortStub),
-                    surveyUnitQualityToolPerretAdapterStub,
-                    configStub,
-                    dataProcessingContextPersistancePortStub
-            );
-
-    @Test
-    void saveDataTest_valid_only_collected_array() throws Exception {
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-
-        //THEN
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().campaignId()).isEqualTo(campaignId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().questionnaireId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().interrogationId()).isEqualTo(interrogationId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data()).isNotNull();
-
-        // We retrieve and cast the Map "COLLECTED"
-        Map<String, Object> collectedData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("COLLECTED"));
-        Assertions.assertThat(collectedData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR");
-
-        // We retrieve and cast the Map "TESTVAR"
-        Map<String, Object> testVarMap = JsonUtils.asMap(collectedData.get("TESTVAR"));
-        Assertions.assertThat(testVarMap).isNotNull().hasSize(1).containsKey(DataState.COLLECTED.toString());
-
-        // We retrieve and cast the List "COLLECTED"
-        List<String> collectedList = JsonUtils.asStringList(testVarMap.get(DataState.COLLECTED.toString()));
-        Assertions.assertThat(collectedList).isNotNull().isInstanceOf(List.class).containsExactly("test");
-
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("EXTERNAL")).isNull();
-    }
-
-    @Test
-    void saveDataTest_valid_only_collected_value() throws Exception {
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": \"test\"}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-
-        //THEN
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().campaignId()).isEqualTo(campaignId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().questionnaireId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().interrogationId()).isEqualTo(interrogationId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data()).isNotNull();
-
-        Map<String, Object> collectedData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("COLLECTED"));
-        Assertions.assertThat(collectedData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR");
-
-        Map<String, Object> testVarMap = JsonUtils.asMap(collectedData.get("TESTVAR"));
-        Assertions.assertThat(testVarMap).isNotNull().hasSize(1).containsKey(DataState.COLLECTED.toString());
-        Assertions.assertThat(testVarMap.get(DataState.COLLECTED.toString())).isNotNull().isEqualTo("test");
-        Assertions.assertThat(testVarMap.get(DataState.COLLECTED.toString())).isInstanceOf(String.class);
-
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("EXTERNAL")).isNull();
-    }
-
-    @Test
-    void saveDataTest_valid_only_external_array() throws Exception {
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": [\"test\"]}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-
-        //THEN
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().campaignId()).isEqualTo(campaignId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().questionnaireId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().interrogationId()).isEqualTo(interrogationId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data()).isNotNull();
-
-        Map<String, Object> externalData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("EXTERNAL"));
-        Assertions.assertThat(externalData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR_EXT");
-
-        Object extVarValue = externalData.get("TESTVAR_EXT");
-        Assertions.assertThat(extVarValue).isNotNull().isInstanceOf(List.class);
-        List<String> extValCast = JsonUtils.asStringList(extVarValue);
-        Assertions.assertThat(extValCast).containsExactly("test");
-
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("COLLECTED")).isNull();
-    }
-
-    @Test
-    void saveDataTest_valid_only_external_value() throws Exception {
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test\"}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-
-        //THEN
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().campaignId()).isEqualTo(campaignId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().questionnaireId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().interrogationId()).isEqualTo(interrogationId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data()).isNotNull();
-
-        Map<String, Object> externalData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("EXTERNAL"));
-        Assertions.assertThat(externalData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR_EXT");
-
-
-        Assertions.assertThat(externalData.get("TESTVAR_EXT")).isNotNull().isEqualTo("test");
-
-        Assertions.assertThat(externalData.get("TESTVAR_EXT")).isInstanceOf(String.class);
-
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("COLLECTED")).isNull();
-    }
-
-    @Test
-    void saveDataTest_valid_both_only_collected_datastate() throws Exception {
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test_ext\"}, " +
-                "\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-
-        //THEN
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().campaignId()).isEqualTo(campaignId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().questionnaireId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().interrogationId()).isEqualTo(interrogationId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data()).isNotNull();
-
-        Map<String, Object> externalData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("EXTERNAL"));
-        Assertions.assertThat(externalData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR_EXT");
-
-        //External variable
-        Assertions.assertThat(externalData.get("TESTVAR_EXT")).isNotNull().isEqualTo("test_ext");
-        Assertions.assertThat(externalData.get("TESTVAR_EXT")).isInstanceOf(String.class);
-
-        //Collected variable
-        Map<String, Object> collectedData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("COLLECTED"));
-        Assertions.assertThat(collectedData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR");
-        Map<String,Object> colVarValue = JsonUtils.asMap(collectedData.get("TESTVAR"));
-        Assertions.assertThat(colVarValue).containsOnlyKeys(DataState.COLLECTED.toString());
-        Assertions.assertThat(colVarValue.get(DataState.COLLECTED.toString()))
-                .isNotNull()
-                .isInstanceOf(List.class);
-        List<String> colVarCast = JsonUtils.asStringList(colVarValue.get(DataState.COLLECTED.toString()));
-        Assertions.assertThat(colVarCast).containsExactly("test");
-    }
-
-    @Test
-    void saveDataTest_valid_both_multiple_datastate() throws Exception {
-        //GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test_ext\"}, " +
-                "\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test\"], \"EDITED\": [\"test_ed\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-
-        //THEN
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().campaignId()).isEqualTo(campaignId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().questionnaireId()).isEqualTo(questionnaireId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().interrogationId()).isEqualTo(interrogationId);
-        Assertions.assertThat(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data()).isNotNull();
-
-        Map<String, Object> externalData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("EXTERNAL"));
-        Assertions.assertThat(externalData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR_EXT");
-
-        //External variables
-        Assertions.assertThat(externalData.get("TESTVAR_EXT"))
-                .isNotNull()
-                .isEqualTo("test_ext")
-                .isInstanceOf(String.class);
-
-        //Collected variables
-        Map<String, Object> collectedData = JsonUtils.asMap(lunaticJsonRawDataPersistanceStub.getMongoStub().getFirst().data().get("COLLECTED"));
-        Assertions.assertThat(collectedData)
-                .isNotNull()
-                .hasSize(1)
-                .containsOnlyKeys("TESTVAR");
-        Map<String,Object> colVar = JsonUtils.asMap(collectedData.get("TESTVAR"));
-        Assertions.assertThat(colVar).containsOnlyKeys(DataState.COLLECTED.toString(), DataState.EDITED.toString());
-        Assertions.assertThat(colVar.get(DataState.COLLECTED.toString()))
-                .isNotNull()
-                .isInstanceOf(List.class);
-        Assertions.assertThat(JsonUtils.asStringList(colVar.get(DataState.COLLECTED.toString()))).containsExactly("test");
-        Assertions.assertThat(colVar.get(DataState.EDITED.toString()))
-                .isNotNull()
-                .isInstanceOf(List.class);
-        Assertions.assertThat(JsonUtils.asStringList(colVar.get(DataState.EDITED.toString()))).containsExactly("test_ed");
-    }
-
-    @Test
-    void convertRawData_should_not_throw_exception_if_external_not_present() throws Exception {
-        //GIVEN
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        assertDoesNotThrow(() -> lunaticJsonRawDataService.convertRawData(List.of(rawDataModel),new VariablesMap()));
-    }
-
-    @Test
-    void convertRawData_if_external_not_present_test() throws Exception {
-        //GIVEN
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        List<SurveyUnitModel> suModels =  lunaticJsonRawDataService.convertRawData(List.of(rawDataModel),new VariablesMap());
-        Assertions.assertThat(suModels).hasSize(1);
-        Assertions.assertThat(suModels.getFirst().getCollectedVariables()).hasSize(1);
-        Assertions.assertThat(suModels.getFirst().getExternalVariables()).isEmpty();
-    }
-
-
-    @Test
-    void getRawDataByInterrogationId_shouldReturnOnlyMatchingData() {
-        // GIVEN
-        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
-
-        String InterrogationId = "INTERROGATION_1";
-        String secondInterrogationId = "INTERROGATION_2";
-
-        LunaticJsonRawDataModel rawData1 = LunaticJsonRawDataModel.builder()
-                .campaignId("CAMPAIGN")
-                .questionnaireId("QUESTIONNAIRE")
-                .interrogationId(InterrogationId)
-                .data(Map.of("key", "value1"))
-                .mode(Mode.WEB)
-                .build();
-
-        LunaticJsonRawDataModel rawData2 = LunaticJsonRawDataModel.builder()
-                .campaignId("CAMPAIGN")
-                .questionnaireId("QUESTIONNAIRE")
-                .interrogationId(secondInterrogationId)
-                .data(Map.of("key", "value2"))
-                .mode(Mode.WEB)
-                .build();
-
-        lunaticJsonRawDataService.save(rawData1);
-        lunaticJsonRawDataService.save(rawData2);
-
-        // WHEN
-        List<LunaticJsonRawDataModel> result =
-                lunaticJsonRawDataService.getRawDataByInterrogationId(InterrogationId);
-
-        // THEN
-        Assertions.assertThat(result)
-                .hasSize(1)
-                .allMatch(data -> InterrogationId.equals(data.interrogationId()));
-
-        Assertions.assertThat(result.getFirst().data())
-                .containsEntry("key", "value1");
-    }
-
-    @Test
-    void convertRawData_should_not_throw_exception_if_collected_not_present() throws Exception {
-        //GIVEN
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test\"}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        assertDoesNotThrow(() -> lunaticJsonRawDataService.convertRawData(List.of(rawDataModel),new VariablesMap()));
-    }
-
-    @Test
-    void convertRawData_if_collected_not_present_test() throws Exception {
-        //GIVEN
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test\"}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        List<SurveyUnitModel> suModels =  lunaticJsonRawDataService.convertRawData(List.of(rawDataModel),new VariablesMap());
-        Assertions.assertThat(suModels).hasSize(1);
-        Assertions.assertThat(suModels.getFirst().getExternalVariables()).hasSize(1);
-        Assertions.assertThat(suModels.getFirst().getCollectedVariables()).isEmpty();
-    }
-
-
-    @ParameterizedTest
-    @ValueSource(ints = {5,500,5000,10000})
-    void convertRawData_multipleBatchs(int rawDataSize) throws Exception {
-        //GIVEN
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "SAMPLETEST-PARADATA-V1";
-        List<String> interrogationIdList = prepareConvertTest(rawDataSize, campaignId, questionnaireId);
-        //Activate review
-        dataProcessingContextPersistancePortStub.getMongoStub().add(
-                DataProcessingContextMapper.INSTANCE.modelToDocument(
-                        DataProcessingContextModel.builder()
-                                .collectionInstrumentId(questionnaireId)
-                                .withReview(true)
-                                .kraftwerkExecutionScheduleList(new ArrayList<>())
-                                .build()
-                )
-        );
-
-        //WHEN
-        DataProcessResult dataProcessResult = lunaticJsonRawDataService.processRawData(questionnaireId);
-
-        //THEN
-        Assertions.assertThat(dataProcessResult.dataCount()).isEqualTo(rawDataSize * 2/*EDITED*/);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(rawDataSize * 2);
-        Assertions.assertThat(surveyUnitQualityToolPerretAdapterStub.getReceivedMaps())
-                .hasSize(Math.ceilDiv(rawDataSize, configStub.getRawDataProcessingBatchSize()));
-        Assertions.assertThat(surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().getFirst()).containsKey(questionnaireId);
-        Assertions.assertThat(surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().getFirst().get(questionnaireId))
-                .contains("TESTinterrogationId1");
-    }
-
-    @Test
-    void convertRawData_review_desactivated() throws Exception {
-        //GIVEN
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "SAMPLETEST-PARADATA-V1";
-        List<String> interrogationIdList = prepareConvertTest(1, campaignId, questionnaireId);
-
-        //Desactivate review
-        dataProcessingContextPersistancePortStub.getMongoStub().add(
-                DataProcessingContextMapper.INSTANCE.modelToDocument(
-                        DataProcessingContextModel.builder()
-                                .collectionInstrumentId(questionnaireId)
-                                .withReview(false)
-                                .kraftwerkExecutionScheduleList(new ArrayList<>())
-                                .build()
-                )
-        );
-
-        //WHEN
-        DataProcessResult dataProcessResult = lunaticJsonRawDataService.processRawData(questionnaireId);
-
-        //THEN
-        Assertions.assertThat(dataProcessResult.dataCount()).isEqualTo(2);
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
-        Assertions.assertThat(surveyUnitQualityToolPerretAdapterStub.getReceivedMaps()).isEmpty();
-    }
-
-    @Test
-    void getUnprocessedDataIdsTest_only_processed_data() throws JsonProcessingException {
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test_ext\"}, " +
-                "\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test\"], \"EDITED\": [\"test_ed\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .processDate(LocalDateTime.now())
-                .build();
-
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-
-        Assertions.assertThat(lunaticJsonRawDataService.getUnprocessedDataIds()).isEmpty();
-    }
-    @Test
-    void getUnprocessedDataIdsTest_unprocessed_data() throws JsonProcessingException {
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        String campaignId = "SAMPLETEST-PARADATA-V1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-        String json = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test_ext\"}, " +
-                "\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test\"], \"EDITED\": [\"test_ed\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .processDate(LocalDateTime.now())
-                .build();
-
-        String interrogationId2 = "TESTinterrogationId2";
-        String json2 = "{\"EXTERNAL\": {\"TESTVAR_EXT\": \"test_ext2\"}, " +
-                "\"COLLECTED\": {\"TESTVAR\": {\"COLLECTED\": [\"test2\"], \"EDITED\": [\"test_ed2\"]}}}";
-
-        LunaticJsonRawDataModel rawDataModel2 = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId2)
-                .data(JsonUtils.jsonToMap(json2))
-                .mode(Mode.WEB)
-                .build();
-        //WHEN
-        lunaticJsonRawDataService.save(rawDataModel);
-        lunaticJsonRawDataService.save(rawDataModel2);
-
-        Assertions.assertThat(lunaticJsonRawDataService.getUnprocessedDataIds()).isNotEmpty();
-        Assertions.assertThat(lunaticJsonRawDataService.getUnprocessedDataIds()).hasSize(1);
-        Assertions.assertThat(lunaticJsonRawDataService.getUnprocessedDataIds().getFirst().interrogationId()).isEqualTo("TESTinterrogationId2");
-    }
-
-
-    private List<String> prepareConvertTest(int rawDataSize, String campaignId, String questionnaireId) throws JsonProcessingException {
-        //CLEAN
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().clear();
-        dataProcessingContextPersistancePortStub.getMongoStub().clear();
-
-        //GIVEN
-        List<String> interrogationIdList = new ArrayList<>();
-        for (int i = 0; i < rawDataSize; i++) {
-            String interrogationId = "TESTinterrogationId" + (i + 1);
-            String json = "{\"EXTERNAL\": {\"RPPRENOM\": \"TEST_EXT%d\"}, ".formatted(i) +
-                    "\"COLLECTED\": {\"PRENOMREP\": {\"COLLECTED\": [\"test%d\"], \"EDITED\": [\"test_ed%d\"]}}}"
-                            .formatted(i, i);
-
-            LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                    .campaignId(campaignId)
-                    .questionnaireId(questionnaireId)
-                    .interrogationId(interrogationId)
-                    .data(JsonUtils.jsonToMap(json))
-                    .mode(Mode.WEB)
-                    .build();
-
-            interrogationIdList.add(interrogationId);
-            lunaticJsonRawDataPersistanceStub.getMongoStub()
-                    .add(LunaticJsonRawDataDocumentMapper.INSTANCE.modelToDocument(rawDataModel));
-        }
-        return interrogationIdList;
-    }
-
-    @Test
-    void convertRawData_collected_array_with_null_and_empty_values_should_ignore_them() throws Exception {
-        // GIVEN
-        String campaignId = "SAMPLETEST-PARADATA-v1";
-        String questionnaireId = "TESTIDQUEST";
-        String interrogationId = "TESTinterrogationId";
-
-        String json = """
-        {
-          "COLLECTED": {
-            "TESTVAR": {
-              "COLLECTED": [null, "", null, "12", ""]
-            }
-          }
-        }
-        """;
-
-        LunaticJsonRawDataModel rawDataModel = LunaticJsonRawDataModel.builder()
-                .campaignId(campaignId)
-                .questionnaireId(questionnaireId)
-                .interrogationId(interrogationId)
-                .data(JsonUtils.jsonToMap(json))
-                .mode(Mode.WEB)
-                .build();
-
-        // WHEN
-        List<SurveyUnitModel> suModels =
-                lunaticJsonRawDataService.convertRawData(List.of(rawDataModel), new VariablesMap());
-
-        // THEN
-        Assertions.assertThat(suModels).hasSize(1);
-
-        SurveyUnitModel suModel = suModels.getFirst();
-        List<VariableModel> collectedVars = suModel.getCollectedVariables();
-
-        // Only the non-empty values should be persisted
-        Assertions.assertThat(collectedVars).hasSize(1);
-        System.out.println(suModel);
-
-        VariableModel variableModel = collectedVars.getFirst();
-        Assertions.assertThat(variableModel.varId()).isEqualTo("TESTVAR");
-        Assertions.assertThat(variableModel.value()).isEqualTo("12");
-
-        Assertions.assertThat(variableModel.iteration()).isEqualTo(4);
-    }
-
-
-    @Test
-    void getValueString_null_test(){
-        Object stringObject = null;
-
-        Assertions.assertThat(getValueString(stringObject)).isEqualTo("null");
-    }
-
-    @Test
-    void getValueString_string_test(){
-        Object stringObject = "test";
-
-        Assertions.assertThat(getValueString(stringObject)).isEqualTo("test");
-    }
-    @Test
-    void getValueString_int_test(){
-        Object intObject = 10;
-
-        Assertions.assertThat(getValueString(intObject)).isEqualTo("10");
-    }
-
-    @Test
-    void getValueString_float_test(){
-        Object floatObject = 10.111f;
-
-        Assertions.assertThat(getValueString(floatObject)).isEqualTo("10.111");
-    }
-
-    @Test
-    void getValueString_double_test(){
-        Object doubleObject = 101010101010.111d;
-
-        Assertions.assertThat(getValueString(doubleObject)).isEqualTo("101010101010.111");
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceUnitTest.java b/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceUnitTest.java
index 1c24ff3f..1e7ffd69 100644
--- a/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceUnitTest.java
+++ b/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceUnitTest.java
@@ -1,106 +1,767 @@
 package fr.insee.genesis.domain.service.rawdata;
 
 import fr.insee.bpm.metadata.model.MetadataModel;
+import fr.insee.bpm.metadata.model.VariablesMap;
+import fr.insee.genesis.configuration.Config;
+import fr.insee.genesis.controller.dto.rawdata.LunaticJsonRawDataUnprocessedDto;
 import fr.insee.genesis.controller.utils.ControllerUtils;
+import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
+import fr.insee.genesis.domain.model.surveyunit.DataState;
+import fr.insee.genesis.domain.model.surveyunit.GroupedInterrogation;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.domain.ports.spi.DataProcessingContextPersistancePort;
 import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;
-import fr.insee.genesis.domain.ports.spi.QuestionnaireMetadataPersistencePort;
 import fr.insee.genesis.domain.ports.spi.SurveyUnitQualityToolPort;
 import fr.insee.genesis.domain.service.context.DataProcessingContextService;
 import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
 import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
 import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
+import fr.insee.genesis.exceptions.GenesisError;
+import fr.insee.genesis.exceptions.GenesisException;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import lombok.SneakyThrows;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
 import org.mockito.Mockito;
 
-import java.util.HashSet;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
 
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class LunaticJsonRawDataServiceTest {
 
-class LunaticJsonRawDataServiceUnitTest {
+    @Mock
+    private LunaticJsonRawDataPersistencePort lunaticJsonRawDataPersistencePort;
+    @Mock
+    private ControllerUtils controllerUtils;
+    @Mock
+    private QuestionnaireMetadataService metadataService;
+    @Mock
+    private SurveyUnitService surveyUnitService;
+    @Mock
+    private SurveyUnitQualityService surveyUnitQualityService;
+    @Mock
+    private SurveyUnitQualityToolPort surveyUnitQualityToolPort;
+    @Mock
+    private DataProcessingContextService dataProcessingContextService;
+    @Mock
+    private DataProcessingContextPersistancePort dataProcessingContextPersistancePort;
+    @Mock
+    private FileUtils fileUtils;
+    @Mock
+    private Config config;
 
-    static LunaticJsonRawDataService lunaticJsonRawDataService;
+    @InjectMocks
+    private LunaticJsonRawDataService service;
 
-    static LunaticJsonRawDataPersistencePort lunaticJsonRawDataPersistencePort;
+    private static final String CAMPAIGN_ID = "campaign-1";
+    private static final String QUESTIONNAIRE_ID = "questionnaire-1";
+    private static final String INTERROGATION_ID = "interrogation-1";
 
-    static QuestionnaireMetadataService metadataService;
+    @Nested
+    @DisplayName("save()")
+    class SaveTests {
+        @Test
+        @DisplayName("Calls persistence port")
+        void save_delegatesToPort() {
+            //GIVEN
+            LunaticJsonRawDataModel model = buildRawDataWithCollected(Map.of());
 
-    @BeforeEach
-    void init() {
-        lunaticJsonRawDataPersistencePort = mock(LunaticJsonRawDataPersistencePort.class);
-        metadataService = mock(QuestionnaireMetadataService.class);
-        lunaticJsonRawDataService = new LunaticJsonRawDataService(
-                lunaticJsonRawDataPersistencePort,
-                new ControllerUtils(new FileUtils(new ConfigStub())),
-                metadataService,
-                mock(SurveyUnitService.class),
-                mock(SurveyUnitQualityService.class),
-                new FileUtils(new ConfigStub()),
-                mock(DataProcessingContextService.class),
-                mock(SurveyUnitQualityToolPort.class),
-                new ConfigStub(),
-                mock(DataProcessingContextPersistancePort.class)
-        );
+            //WHEN
+            service.save(model);
+
+            //THEN
+            verify(lunaticJsonRawDataPersistencePort).save(model);
+        }
     }
 
-    @Test
-    @SneakyThrows
-    void getUnprocessedDataQuestionnaireIds() {
-        //GIVEN
-        Set<String> questionnaireIds = new HashSet<>();
-        questionnaireIds.add("QUEST1");
-        questionnaireIds.add("QUEST2");
-        doReturn(questionnaireIds).when(lunaticJsonRawDataPersistencePort).findDistinctQuestionnaireIdsByNullProcessDate();
-        doReturn(Set.of(Mode.WEB)).when(lunaticJsonRawDataPersistencePort).findModesByQuestionnaire(any());
-        doReturn(new MetadataModel()).when(metadataService).loadAndSaveIfNotExists(any(), any(), any(), any(), any());
+    @Nested
+    @DisplayName("getRawDataByQuestionnaireId()")
+    class GetRawDataByQuestionnaireIdTests {
 
+        @Test
+        @DisplayName("Calls persistence port and returns result")
+        void returns_result_from_port() {
+            //GIVEN
+            LunaticJsonRawDataModel model = buildRawDataWithCollected(Map.of());
+            when(lunaticJsonRawDataPersistencePort
+                    .findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, Mode.WEB, List.of(INTERROGATION_ID)))
+                    .thenReturn(List.of(model));
 
-        //WHEN + THEN
-        Assertions.assertThat(lunaticJsonRawDataService.getUnprocessedDataQuestionnaireIds())
-                .containsExactlyInAnyOrder("QUEST1","QUEST2");
+            //WHEN
+            List<LunaticJsonRawDataModel> result =
+                    service.getRawDataByQuestionnaireId(QUESTIONNAIRE_ID, Mode.WEB, List.of(INTERROGATION_ID));
+
+            //THEN
+            assertThat(result).containsExactly(model);
+        }
     }
 
-    @Test
-    @SneakyThrows
-    void getUnprocessedDataQuestionnaireIds_shouldnt_return_if_no_spec() {
-        //GIVEN
-        Set<String> questionnaireIds = new HashSet<>();
-        questionnaireIds.add("QUEST1"); //No spec
-        questionnaireIds.add("TEST-TABLEAUX");
-        doReturn(questionnaireIds).when(lunaticJsonRawDataPersistencePort).findDistinctQuestionnaireIdsByNullProcessDate();
-        doReturn(Set.of(Mode.WEB)).when(lunaticJsonRawDataPersistencePort).findModesByQuestionnaire(any());
-        //No mock for metadataservice this time
-        metadataService = new QuestionnaireMetadataService(
-                mock(QuestionnaireMetadataPersistencePort.class)
-        );
-        lunaticJsonRawDataService = new LunaticJsonRawDataService(
-                lunaticJsonRawDataPersistencePort,
-                new ControllerUtils(new FileUtils(new ConfigStub())),
-                metadataService,
-                mock(SurveyUnitService.class),
-                mock(SurveyUnitQualityService.class),
-                new FileUtils(new ConfigStub()),
-                mock(DataProcessingContextService.class),
-                mock(SurveyUnitQualityToolPort.class),
-                new ConfigStub(),
-                mock(DataProcessingContextPersistancePort.class)
-        );
-
-
-        //WHEN + THEN
-        Assertions.assertThat(lunaticJsonRawDataService.getUnprocessedDataQuestionnaireIds())
-                .containsExactly("TEST-TABLEAUX");
+    @Nested
+    @DisplayName("getRawDataByInterrogationId()")
+    class GetRawDataByInterrogationIdTests {
+
+        @Test
+        @DisplayName("Calls persistence port")
+        void delegates_to_port() {
+            //GIVEN
+            LunaticJsonRawDataModel lunaticJsonRawDataModel = buildRawDataWithCollected(Map.of());
+            when(lunaticJsonRawDataPersistencePort.findRawDataByInterrogationId(INTERROGATION_ID))
+                    .thenReturn(List.of(lunaticJsonRawDataModel));
+
+            //WHEN
+            List<LunaticJsonRawDataModel> result = service.getRawDataByInterrogationId(INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).containsExactly(lunaticJsonRawDataModel);
+        }
+    }
+
+    @Nested
+    @DisplayName("processRawData(questionnaireId)")
+    class ProcessRawDataNewTests {
+
+        @BeforeEach
+        void commonSetup() throws GenesisException {
+            when(config.getRawDataProcessingBatchSize()).thenReturn(100);
+            when(controllerUtils.getModesList(QUESTIONNAIRE_ID, null)).thenReturn(List.of(Mode.WEB));
+            when(dataProcessingContextService.getContextByCollectionInstrumentId(QUESTIONNAIRE_ID)).thenReturn(null);
+        }
+
+        @Test
+        @DisplayName("Returns zero counts when no unprocessed ids")
+        void noUnprocessedIds_returnsZeroCounts() throws GenesisException {
+            //GIVEN
+            MetadataModel metadataModel = new MetadataModel();
+            when(metadataService.loadAndSaveIfNotExists(anyString(), anyString(), any(), any(), any()))
+                    .thenReturn(metadataModel);
+            when(lunaticJsonRawDataPersistencePort
+                    .findUnprocessedInterrogationIdsByCollectionInstrumentId(QUESTIONNAIRE_ID))
+                    .thenReturn(Set.of());
+
+            //WHEN
+            DataProcessResult result = service.processRawData(QUESTIONNAIRE_ID);
+
+            //THEN
+            assertThat(result.dataCount()).isZero();
+            assertThat(result.formattedDataCount()).isZero();
+            verify(surveyUnitService, never()).saveSurveyUnits(any());
+        }
+
+        @Test
+        @DisplayName("Processes one batch and saves survey units")
+        void processOneBatch_savesSurveyUnits() throws GenesisException {
+            //GIVEN
+            MetadataModel metadataModel = new MetadataModel();
+            when(metadataService.loadAndSaveIfNotExists(anyString(), anyString(), any(), any(), any()))
+                    .thenReturn(metadataModel);
+            when(lunaticJsonRawDataPersistencePort
+                    .findUnprocessedInterrogationIdsByCollectionInstrumentId(QUESTIONNAIRE_ID))
+                    .thenReturn(Set.of(INTERROGATION_ID));
+            when(lunaticJsonRawDataPersistencePort
+                    .findRawDataByQuestionnaireId(eq(QUESTIONNAIRE_ID), eq(Mode.WEB), anyList()))
+                    .thenReturn(List.of());
+
+            DataProcessResult result = service.processRawData(QUESTIONNAIRE_ID);
+
+            assertThat(result.dataCount()).isZero(); // empty raw data → no models
+            verify(surveyUnitService, atLeastOnce()).saveSurveyUnits(anyList());
+        }
+
+        @Test
+        @DisplayName("Throws GenesisException when metadata cannot be loaded")
+        void missingMetadata_throwsGenesisException() throws GenesisException {
+            // GIVEN
+            // Null variable map + genesis error in list
+            MetadataModel metadataModel = mock(MetadataModel.class);
+            when(metadataModel.getVariables()).thenReturn(null);
+            when(metadataService.loadAndSaveIfNotExists(anyString(), anyString(), any(), any(), any()))
+                    .thenAnswer(inv -> {
+                        List<Object> errors = inv.getArgument(4);
+                        errors.add(new GenesisError("test"));
+                        return metadataModel;
+                    });
+
+            //WHEN + THEN
+            assertThatThrownBy(() -> service.processRawData(QUESTIONNAIRE_ID))
+                    .isInstanceOf(GenesisException.class);
+        }
+
+        @Test
+        @DisplayName("Sends processed ids to quality tool when review is activated")
+        void withReview_sendsProcessedIds() throws GenesisException, IOException {
+            // GIVEN
+            // Context with review
+            DataProcessingContextModel context = mock(DataProcessingContextModel.class);
+            when(context.isWithReview()).thenReturn(true);
+            when(dataProcessingContextService.getContextByCollectionInstrumentId(QUESTIONNAIRE_ID))
+                    .thenReturn(context);
+
+            MetadataModel metadataModel = new MetadataModel();
+            when(metadataService.loadAndSaveIfNotExists(anyString(), anyString(), any(), any(), any()))
+                    .thenReturn(metadataModel);
+
+            when(lunaticJsonRawDataPersistencePort
+                    .findUnprocessedInterrogationIdsByCollectionInstrumentId(QUESTIONNAIRE_ID))
+                    .thenReturn(Set.of(INTERROGATION_ID));
+
+            // Build raw data with actual COLLECTED variable so it produces a SurveyUnitModel
+            Map<String, Object> varInner = new HashMap<>();
+            varInner.put("COLLECTED", "value1");
+            varInner.put("EDITED", null);
+            Map<String, Object> collected = new HashMap<>();
+            collected.put("VAR1", varInner);
+            LunaticJsonRawDataModel rawData = buildRawDataWithCollected(collected);
+
+            when(lunaticJsonRawDataPersistencePort
+                    .findRawDataByQuestionnaireId(eq(QUESTIONNAIRE_ID), eq(Mode.WEB), anyList()))
+                    .thenReturn(List.of(rawData));
+
+            //Mock response from quality tool
+            ResponseEntity<Object> fakeResponse = ResponseEntity.ok().build();
+            when(surveyUnitQualityToolPort.sendProcessedIds(anyMap())).thenReturn(fakeResponse);
+
+            //WHEN
+            service.processRawData(QUESTIONNAIRE_ID);
+
+            //THEN
+            verify(surveyUnitQualityToolPort, times(1)).sendProcessedIds(anyMap());
+        }
+    }
+
+    @Nested
+    @DisplayName("convertRawData()")
+    class ConvertRawDataTests {
+
+        @Test
+        @DisplayName("Empty raw data list returns empty list")
+        void emptyRawDataList_returnsEmpty() {
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(), new VariablesMap());
+
+            //THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Raw data with no COLLECTED/EXTERNAL variables is ignored")
+        void noVariables_rawDataIgnored() {
+            //GIVEN
+            LunaticJsonRawDataModel rawData = buildRawDataWithCollected(Map.of());
+
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(rawData), new VariablesMap());
+
+            //THEN
+            assertThat(result).isEmpty();
+            verify(lunaticJsonRawDataPersistencePort, atLeastOnce()).updateProcessDates(eq(CAMPAIGN_ID), anySet());
+        }
+
+        @Test
+        @DisplayName("Raw data with COLLECTED variable produces COLLECTED and EDITED models")
+        void withCollectedVariable_producesBothDataStates() {
+            //GIVEN
+            Map<String, Object> varInner = new HashMap<>();
+            varInner.put("COLLECTED", "val");
+            varInner.put("EDITED", null);
+            Map<String, Object> collected = new HashMap<>();
+            collected.put("VAR1", varInner);
+
+            LunaticJsonRawDataModel rawData = buildRawDataWithCollected(collected);
+
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(rawData), new VariablesMap());
+
+            //THEN
+            // Expect 1 COLLECTED (VAR1 has a value) and 0 EDITED (EDITED value is null → empty)
+            long collectedCount = result.stream()
+                    .filter(m -> m.getState() == DataState.COLLECTED).count();
+            assertThat(collectedCount).isEqualTo(1);
+            long editedCount = result.stream()
+                    .filter(m -> m.getState() == DataState.EDITED).count();
+            assertThat(editedCount).isZero();
+        }
+
+        @Test
+        @DisplayName("EDITED value is extracted when present")
+        void withEditedVariable_producesEditedModel() {
+            //GIVEN
+            Map<String, Object> varInner = new HashMap<>();
+            varInner.put("COLLECTED", "original");
+            varInner.put("EDITED", "edited");
+            Map<String, Object> collected = new HashMap<>();
+            collected.put("VAR1", varInner);
+
+            LunaticJsonRawDataModel rawData = buildRawDataWithCollected(collected);
+
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(rawData), new VariablesMap());
+
+            //THEN
+            long editedCount = result.stream()
+                    .filter(m -> m.getState() == DataState.EDITED).count();
+            assertThat(editedCount).isEqualTo(1);
+        }
+
+        @Test
+        @DisplayName("FILIERE model type is detected when 'data' key is present")
+        void filiereModelType_detected() {
+            //GIVEN
+            // Wrap data in "data" key to simulate FILIERE type
+            Map<String, Object> varInner = new HashMap<>();
+            varInner.put("COLLECTED", "val");
+            varInner.put("EDITED", null);
+            Map<String, Object> inner = new HashMap<>();
+            inner.put("VAR1", varInner);
+            Map<String, Object> collected = new HashMap<>();
+            collected.put("COLLECTED", inner);
+            Map<String, Object> outerData = new HashMap<>();
+            outerData.put("data", collected); // triggers FILIERE detection
+
+            LunaticJsonRawDataModel rawData = buildRawDataWithCollected(outerData);
+
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(rawData), new VariablesMap());
+
+            // Should not throw — FILIERE path is followed TODO More asserts
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("validationDate and isCapturedIndirectly are mapped correctly")
+        void optionalFields_mappedCorrectly() {
+            //GIVEN
+            Map<String, Object> varInner = new HashMap<>();
+            varInner.put("COLLECTED", "val");
+            varInner.put("EDITED", null);
+            Map<String, Object> collected = new HashMap<>();
+            collected.put("VAR1", varInner);
+
+            Map<String, Object> data = new HashMap<>();
+            data.put("COLLECTED", collected);
+            data.put("validationDate", "2024-01-15T10:00:00");
+            data.put("isCapturedIndirectly", "true");
+
+            LunaticJsonRawDataModel rawData = LunaticJsonRawDataModel.builder()
+                    .campaignId(CAMPAIGN_ID)
+                    .questionnaireId(QUESTIONNAIRE_ID)
+                    .interrogationId(INTERROGATION_ID)
+                    .idUE("testIdUE")
+                    .mode(Mode.WEB)
+                    .data(data)
+                    .recordDate(LocalDateTime.now())
+                    .build();
+
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(rawData), new VariablesMap());
+
+            //THEN
+            assertThat(result).isNotEmpty();
+            SurveyUnitModel model = result.stream()
+                    .filter(m -> m.getState() == DataState.COLLECTED)
+                    .findFirst().orElseThrow();
+            assertThat(model.getValidationDate()).isEqualTo(LocalDateTime.parse("2024-01-15T10:00:00"));
+            assertThat(model.getIsCapturedIndirectly()).isTrue();
+        }
+
+        @Test
+        @DisplayName("Malformed validationDate falls back to null without throwing")
+        void malformedValidationDate_fallsBackToNull() {
+            //GIVEN
+            Map<String, Object> varInner = new HashMap<>();
+            varInner.put("COLLECTED", "val");
+            varInner.put("EDITED", null);
+            Map<String, Object> collected = new HashMap<>();
+            collected.put("VAR1", varInner);
+
+            Map<String, Object> data = new HashMap<>();
+            data.put("COLLECTED", collected);
+            data.put("validationDate", "not-a-date");
+
+            LunaticJsonRawDataModel rawData = LunaticJsonRawDataModel.builder()
+                    .campaignId(CAMPAIGN_ID)
+                    .questionnaireId(QUESTIONNAIRE_ID)
+                    .interrogationId(INTERROGATION_ID)
+                    .idUE("idUE-1")
+                    .mode(Mode.WEB)
+                    .data(data)
+                    .recordDate(LocalDateTime.now())
+                    .build();
+
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(rawData), new VariablesMap());
+
+            //THEN
+            assertThat(result).isNotEmpty();
+            result.stream()
+                    .filter(m -> m.getState() == DataState.COLLECTED)
+                    .forEach(m -> assertThat(m.getValidationDate()).isNull());
+        }
+
+        @Test
+        @DisplayName("Array values are converted to multiple VariableModels")
+        void arrayValues_convertedToMultipleIterations() {
+            //GIVEN
+            Map<String, Object> varInner = new HashMap<>();
+            varInner.put("COLLECTED", List.of("a", "b", "c"));
+            varInner.put("EDITED", null);
+            Map<String, Object> collected = new HashMap<>();
+            collected.put("ARRAY_VAR", varInner);
+
+            LunaticJsonRawDataModel rawData = buildRawDataWithCollected(collected);
+
+            //WHEN
+            List<SurveyUnitModel> result = service.convertRawData(List.of(rawData), new VariablesMap());
+
+            //THEN
+            SurveyUnitModel collectedModel = result.stream()
+                    .filter(m -> m.getState() == DataState.COLLECTED)
+                    .findFirst().orElseThrow();
+            assertThat(collectedModel.getCollectedVariables()).hasSize(3);
+        }
+    }
+
+    @Nested
+    @DisplayName("getUnprocessedDataIds()")
+    class GetUnprocessedDataIdsTests {
+
+        @Test
+        @DisplayName("Returns DTOs for each interrogation id")
+        void returnsDtos() {
+            //GIVEN
+            GroupedInterrogation grouped = new GroupedInterrogation(
+                    QUESTIONNAIRE_ID, null, List.of("id1", "id2"));
+            when(lunaticJsonRawDataPersistencePort.findUnprocessedIds()).thenReturn(List.of(grouped));
+
+            //WHEN
+            List<LunaticJsonRawDataUnprocessedDto> result = service.getUnprocessedDataIds();
+
+            //THEN
+            assertThat(result).hasSize(2);
+            assertThat(result.get(0).interrogationId()).isEqualTo("id1");
+            assertThat(result.get(1).interrogationId()).isEqualTo("id2");
+        }
+
+        @Test
+        @DisplayName("Returns empty list when no unprocessed ids")
+        void noUnprocessed_returnsEmpty() {
+            //GIVEN
+            when(lunaticJsonRawDataPersistencePort.findUnprocessedIds()).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(service.getUnprocessedDataIds()).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("getUnprocessedDataQuestionnaireIds()")
+    class GetUnprocessedDataQuestionnaireIdsTests {
+
+        @Test
+        @DisplayName("Excludes questionnaire with no modes")
+        void noModes_excluded() {
+            //GIVEN
+            when(lunaticJsonRawDataPersistencePort.findDistinctQuestionnaireIdsByNullProcessDate())
+                    .thenReturn(Set.of(QUESTIONNAIRE_ID));
+            when(lunaticJsonRawDataPersistencePort.findModesByQuestionnaire(QUESTIONNAIRE_ID))
+                    .thenReturn(Set.of());
+
+            //WHEN + THEN
+            assertThat(service.getUnprocessedDataQuestionnaireIds()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Includes questionnaire when specs are present for all modes")
+        void specsPresent_included() throws GenesisException {
+            //GIVEN
+            when(lunaticJsonRawDataPersistencePort.findDistinctQuestionnaireIdsByNullProcessDate())
+                    .thenReturn(Set.of(QUESTIONNAIRE_ID));
+            when(lunaticJsonRawDataPersistencePort.findModesByQuestionnaire(QUESTIONNAIRE_ID))
+                    .thenReturn(Set.of(Mode.WEB));
+
+            MetadataModel metadataModel = new MetadataModel();
+            when(metadataService.loadAndSaveIfNotExists(anyString(), anyString(), any(), any(), any()))
+                    .thenReturn(metadataModel);
+
+            //WHEN
+            Set<String> result = service.getUnprocessedDataQuestionnaireIds();
+
+            //THEN
+            assertThat(result).containsExactly(QUESTIONNAIRE_ID);
+        }
+
+        @Test
+        @DisplayName("Excludes questionnaire when GenesisException is thrown during spec load")
+        void genesisException_excluded() throws GenesisException {
+            //GIVEN
+            when(lunaticJsonRawDataPersistencePort.findDistinctQuestionnaireIdsByNullProcessDate())
+                    .thenReturn(Set.of(QUESTIONNAIRE_ID));
+            when(lunaticJsonRawDataPersistencePort.findModesByQuestionnaire(QUESTIONNAIRE_ID))
+                    .thenReturn(Set.of(Mode.WEB));
+            when(metadataService.loadAndSaveIfNotExists(anyString(), anyString(), any(), any(), any()))
+                    .thenThrow(new GenesisException(500, "error"));
+
+            //WHEN + THEN
+            assertThat(service.getUnprocessedDataQuestionnaireIds()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Excludes questionnaire when metadata model is null")
+        void nullMetadataModel_excluded() throws GenesisException {
+            //GIVEN
+            when(lunaticJsonRawDataPersistencePort.findDistinctQuestionnaireIdsByNullProcessDate())
+                    .thenReturn(Set.of(QUESTIONNAIRE_ID));
+            when(lunaticJsonRawDataPersistencePort.findModesByQuestionnaire(QUESTIONNAIRE_ID))
+                    .thenReturn(Set.of(Mode.WEB));
+            when(metadataService.loadAndSaveIfNotExists(anyString(), anyString(), any(), any(), any()))
+                    .thenReturn(null);
+
+            //WHEN + THEN
+            assertThat(service.getUnprocessedDataQuestionnaireIds()).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("updateProcessDates()")
+    class UpdateProcessDatesTests {
+
+        @Test
+        @DisplayName("Groups interrogation ids by campaign and calls port once per campaign")
+        void groupsByCampaignId() {
+            //GIVEN
+            SurveyUnitModel m1 = SurveyUnitModel.builder()
+                    .campaignId(CAMPAIGN_ID).interrogationId("id1").build();
+            SurveyUnitModel m2 = SurveyUnitModel.builder()
+                    .campaignId(CAMPAIGN_ID).interrogationId("id2").build();
+            SurveyUnitModel m3 = SurveyUnitModel.builder()
+                    .campaignId("campaign-2").interrogationId("id3").build();
+
+            //WHEN
+            service.updateProcessDates(List.of(m1, m2, m3));
+
+            //THEN
+            verify(lunaticJsonRawDataPersistencePort).updateProcessDates(eq(CAMPAIGN_ID), argThat(s -> s.containsAll(Set.of("id1", "id2"))));
+            verify(lunaticJsonRawDataPersistencePort).updateProcessDates(eq("campaign-2"), argThat(s -> s.contains("id3")));
+        }
+
+        @Test
+        @DisplayName("Does nothing for empty list")
+        void emptyList_noCalls() {
+            //WHEN
+            service.updateProcessDates(List.of());
+
+            //THEN
+            verifyNoInteractions(lunaticJsonRawDataPersistencePort);
+        }
+    }
+
+    @Nested
+    @DisplayName("findDistinctQuestionnaireIds()")
+    class FindDistinctQuestionnaireIdsTests {
+
+        @Test
+        @DisplayName("Call persistence port")
+        void delegates_to_port() {
+            //WHEN
+            when(lunaticJsonRawDataPersistencePort.findDistinctQuestionnaireIds())
+                    .thenReturn(Set.of("q1", "q2"));
+
+            //THEN
+            assertThat(service.findDistinctQuestionnaireIds()).containsExactlyInAnyOrder("q1", "q2");
+        }
+    }
+
+    @Nested
+    @DisplayName("countRawResponsesByQuestionnaireId()")
+    class CountRawResponsesTests {
+
+        @Test
+        @DisplayName("Returns count from persistence port")
+        void returnsCount() {
+            //WHEN
+            when(lunaticJsonRawDataPersistencePort.countRawResponsesByQuestionnaireId(QUESTIONNAIRE_ID))
+                    .thenReturn(42L);
+
+            //THEN
+            assertThat(service.countRawResponsesByQuestionnaireId(QUESTIONNAIRE_ID)).isEqualTo(42L);
+        }
+    }
+
+    @Nested
+    @DisplayName("findProcessedIdsgroupedByQuestionnaireSince()")
+    class FindProcessedIdsSinceTests {
+
+        @Test
+        @DisplayName("Filters out questionnaires without review context")
+        void noReview_filtered() {
+            //GIVEN
+            LocalDateTime since = LocalDateTime.now().minusDays(1);
+            GroupedInterrogation group = new GroupedInterrogation(CAMPAIGN_ID, QUESTIONNAIRE_ID, List.of("id1"));
+            when(lunaticJsonRawDataPersistencePort.findProcessedIdsGroupedByQuestionnaireSince(since))
+                    .thenReturn(List.of(group));
+
+            DataProcessingContextModel dataProcessingContextModel = mock(DataProcessingContextModel.class);
+            when(dataProcessingContextModel.isWithReview()).thenReturn(false);
+            when(dataProcessingContextModel.getPartitionId()).thenReturn(CAMPAIGN_ID);
+            when(dataProcessingContextPersistancePort.findByPartitionIds(List.of(CAMPAIGN_ID)))
+                    .thenReturn(List.of(dataProcessingContextModel));
+
+            //WHEN
+            Map<String, List<String>> result = service.findProcessedIdsgroupedByQuestionnaireSince(since);
+
+            //THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Includes questionnaires with review context")
+        void withReview_included() {
+            //GIVEN
+            LocalDateTime since = LocalDateTime.now().minusDays(1);
+            GroupedInterrogation groupedInterrogation = new GroupedInterrogation(QUESTIONNAIRE_ID, CAMPAIGN_ID, List.of("id1"));
+            when(lunaticJsonRawDataPersistencePort.findProcessedIdsGroupedByQuestionnaireSince(since))
+                    .thenReturn(List.of(groupedInterrogation));
+
+            DataProcessingContextModel dataProcessingContextModel = DataProcessingContextModel.builder()
+                    .partitionId(CAMPAIGN_ID)
+                    .collectionInstrumentId(QUESTIONNAIRE_ID)
+                    .withReview(true)
+                    .build();
+            when(dataProcessingContextPersistancePort.findByPartitionIds(List.of(CAMPAIGN_ID)))
+                    .thenReturn(List.of(dataProcessingContextModel));
+
+            //WHEN
+            Map<String, List<String>> result = service.findProcessedIdsgroupedByQuestionnaireSince(since);
+
+            //THEN
+            assertThat(result).containsKey(QUESTIONNAIRE_ID);
+            assertThat(result.get(QUESTIONNAIRE_ID)).containsExactly("id1");
+        }
+    }
+
+    @Nested
+    @DisplayName("findRawDataByQuestionnaireId(questionnaireId, pageable)")
+    class FindRawDataPageableTests {
+
+        @Test
+        @DisplayName("Returns page from persistence port")
+        void returnsPage() {
+            //GIVEN
+            Pageable pageable = PageRequest.of(0, 10);
+            LunaticJsonRawDataModel model = buildRawDataWithCollected(Map.of());
+            Page<LunaticJsonRawDataModel> page = new PageImpl<>(List.of(model));
+            when(lunaticJsonRawDataPersistencePort.findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, pageable))
+                    .thenReturn(page);
+
+            //WHEN
+            Page<LunaticJsonRawDataModel> result =
+                    service.findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, pageable);
+
+            //THEN
+            assertThat(result.getContent()).containsExactly(model);
+        }
+    }
+
+    @Nested
+    @DisplayName("getValueString() util")
+    class GetValueStringTests {
+
+        @Test
+        @DisplayName("Double value strips trailing zeros")
+        void doubleStripsTrailingZeros() {
+            //WHEN + THEN
+            assertThat(LunaticJsonRawDataService.getValueString(1.50)).isEqualTo("1.5");
+        }
+
+        @Test
+        @DisplayName("Float value strips trailing zeros")
+        void floatStripsTrailingZeros() {
+            //WHEN + THEN
+            assertThat(LunaticJsonRawDataService.getValueString(1.500f)).isEqualTo("1.5");
+        }
+
+        @Test
+        @DisplayName("Integer value returns plain string")
+        void integerReturnsPlainString() {
+            //WHEN + THEN
+            assertThat(LunaticJsonRawDataService.getValueString(42)).isEqualTo("42");
+        }
+
+        @Test
+        @DisplayName("String value returns same string")
+        void stringReturnsItself() {
+            //WHEN + THEN
+            assertThat(LunaticJsonRawDataService.getValueString("hello")).isEqualTo("hello");
+        }
+
+        @Test
+        @DisplayName("Null returns 'null' string")
+        void nullReturnsNullString() {
+            //WHEN + THEN
+            assertThat(LunaticJsonRawDataService.getValueString(null)).isEqualTo("null");
+        }
+
+        @Test
+        @DisplayName("BigDecimal integer-like double has no decimal point")
+        void bigDecimalIntegerDouble() {
+            //WHEN + THEN
+            assertThat(LunaticJsonRawDataService.getValueString(3.0)).isEqualTo("3");
+        }
+    }
+
+    //UTILS
+    /** Builds a minimal raw data document with COLLECTED data. */
+    private LunaticJsonRawDataModel buildRawDataWithCollected(Map<String, Object> collectedData) {
+        Map<String, Object> data = new HashMap<>();
+        data.put("COLLECTED", collectedData);
+
+        return LunaticJsonRawDataModel.builder()
+                .campaignId(CAMPAIGN_ID)
+                .questionnaireId(QUESTIONNAIRE_ID)
+                .interrogationId(INTERROGATION_ID)
+                .idUE("idUE-1")
+                .mode(Mode.WEB)
+                .data(data)
+                .recordDate(LocalDateTime.now())
+                .build();
     }
 
     @Test
@@ -108,10 +769,10 @@ void existsByInterrogationId_shouldReturnTrue_whenExists() {
         // When
         Mockito.when(lunaticJsonRawDataPersistencePort.existsByInterrogationId(DEFAULT_INTERROGATION_ID))
                 .thenReturn(true);
-        boolean exists = lunaticJsonRawDataService.existsByInterrogationId(DEFAULT_INTERROGATION_ID);
+        boolean exists = service.existsByInterrogationId(DEFAULT_INTERROGATION_ID);
 
         // Then
-        Assertions.assertThat(exists).isTrue();
+        assertThat(exists).isTrue();
     }
 
     @Test
@@ -122,9 +783,9 @@ void existsByInterrogationId_shouldReturnFalse_whenNotExists() {
                 .thenReturn(false);
 
         // When
-        boolean exists = lunaticJsonRawDataService.existsByInterrogationId(unknownId);
+        boolean exists = service.existsByInterrogationId(unknownId);
 
         // Then
-        Assertions.assertThat(exists).isFalse();
+        assertThat(exists).isFalse();
     }
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/rawdata/RawResponseServiceUnitTest.java b/src/test/java/fr/insee/genesis/domain/service/rawdata/RawResponseServiceUnitTest.java
index 9349c33d..6cb36ab9 100644
--- a/src/test/java/fr/insee/genesis/domain/service/rawdata/RawResponseServiceUnitTest.java
+++ b/src/test/java/fr/insee/genesis/domain/service/rawdata/RawResponseServiceUnitTest.java
@@ -4,6 +4,7 @@
 import fr.insee.bpm.metadata.model.VariablesMap;
 import fr.insee.genesis.TestConstants;
 import fr.insee.genesis.controller.utils.ControllerUtils;
+import fr.insee.genesis.domain.model.surveyunit.DataState;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
@@ -16,7 +17,6 @@
 import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
 import fr.insee.genesis.exceptions.GenesisException;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
 import fr.insee.modelefiliere.ModeDto;
 import fr.insee.modelefiliere.RawResponseDto;
 import lombok.SneakyThrows;
@@ -25,9 +25,15 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.Mockito;
 
 import java.time.LocalDateTime;
@@ -45,26 +51,28 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 class RawResponseServiceUnitTest {
 
     static RawResponseService rawResponseService;
+
+    @Mock
     static RawResponsePersistencePort rawResponsePersistencePort;
+    @Mock
     static ControllerUtils controllerUtils;
+    @Mock
     static QuestionnaireMetadataService metadataService;
+    @Mock
     static SurveyUnitService surveyUnitService;
 
+    @Captor
     private ArgumentCaptor<List<SurveyUnitModel>> surveyUnitModelsCaptor;
 
     private static final String TEST_VALIDATION_DATE = "2025-11-11T06:00:00Z";
 
     @BeforeEach
-    @SuppressWarnings("unchecked")
     void init() {
-        rawResponsePersistencePort = mock(RawResponsePersistencePort.class);
-        controllerUtils = mock(ControllerUtils.class);
-        metadataService = mock(QuestionnaireMetadataService.class);
-        surveyUnitService = mock(SurveyUnitService.class);
-
         rawResponseService = new RawResponseService(
                 controllerUtils,
                 metadataService,
@@ -72,12 +80,10 @@ void init() {
                 mock(SurveyUnitQualityService.class),
                 mock(SurveyUnitQualityToolPort.class),
                 mock(DataProcessingContextService.class),
-                new FileUtils(new ConfigStub()),
-                new ConfigStub(),
+                new FileUtils(TestConstants.getConfigStub()),
+                TestConstants.getConfigStub(),
                 rawResponsePersistencePort
         );
-
-        surveyUnitModelsCaptor = ArgumentCaptor.forClass(List.class);
     }
 
     @Test
@@ -111,14 +117,14 @@ void getUnprocessedCollectionInstrumentIds_shouldnt_return_if_no_spec() {
                 mock(QuestionnaireMetadataPersistencePort.class)
         );
         rawResponseService = new RawResponseService(
-                new ControllerUtils(new FileUtils(new ConfigStub())),
+                new ControllerUtils(new FileUtils(TestConstants.getConfigStub())),
                 metadataService,
                 mock(SurveyUnitService.class),
                 mock(SurveyUnitQualityService.class),
                 mock(SurveyUnitQualityToolPort.class),
                 mock(DataProcessingContextService.class),
-                new FileUtils(new ConfigStub()),
-                new ConfigStub(),
+                new FileUtils(TestConstants.getConfigStub()),
+                TestConstants.getConfigStub(),
                 rawResponsePersistencePort
         );
 
@@ -412,4 +418,302 @@ void getDistinctCollectionInstrumentIds_test(){
         //WHEN + THEN
         Assertions.assertThat(rawResponseService.getDistinctCollectionInstrumentIds()).containsExactly(collectionInstrumentId);
     }
+
+    @Nested
+    @DisplayName("convertRawResponse tests")
+    class ConvertRawResponseTests {
+
+        private VariablesMap variablesMap;
+
+        @BeforeEach
+        void setup() {
+            variablesMap = new VariablesMap();
+        }
+
+        @Test
+        @DisplayName("Simple COLLECTED raw response conversion")
+        void convertRawResponse_shouldConvertCollectedVariable() {
+            // GIVEN
+            RawResponseModel rawResponse = buildRawResponseWithVar("VAR1", "COLLECTED", "value1");
+            List<RawResponseModel> rawResponses = List.of(rawResponse);
+
+            // WHEN
+            List<SurveyUnitModel> result = rawResponseService.convertRawResponse(rawResponses, variablesMap);
+
+            // THEN
+            Assertions.assertThat(result).hasSize(1); // only COLLECTED state (EDITED has no data)
+            Assertions.assertThat(result.getFirst().getCollectedVariables()).hasSize(1);
+            Assertions.assertThat(result.getFirst().getCollectedVariables().getFirst().varId()).isEqualTo("VAR1");
+            Assertions.assertThat(result.getFirst().getCollectedVariables().getFirst().value()).isEqualTo("value1");
+        }
+
+        @Test
+        @DisplayName("Simple EDITED conversion")
+        void convertRawResponse_shouldConvertEditedVariable() {
+            // GIVEN
+            RawResponseModel rawResponse = buildRawResponseWithVar("VAR1", "EDITED", "editedValue");
+            List<RawResponseModel> rawResponses = List.of(rawResponse);
+
+            // WHEN
+            List<SurveyUnitModel> result = rawResponseService.convertRawResponse(rawResponses, variablesMap);
+
+            // THEN
+            // On attend 1 modèle EDITED avec des variables
+            List<SurveyUnitModel> editedModels = result.stream()
+                    .filter(m -> m.getState() == DataState.EDITED)
+                    .toList();
+            Assertions.assertThat(editedModels).hasSize(1);
+            Assertions.assertThat(editedModels.getFirst().getCollectedVariables()).hasSize(1);
+            Assertions.assertThat(editedModels.getFirst().getCollectedVariables().getFirst().value()).isEqualTo("editedValue");
+        }
+
+        @Test
+        @DisplayName("Must convert external variables in COLLECTED")
+        void convertRawResponse_shouldConvertExternalVariables() {
+            // GIVEN
+            RawResponseModel rawResponse = buildRawResponseWithCollectedAndExternal("VAR1", "val1", "EXT1", "extVal");
+            List<RawResponseModel> rawResponses = List.of(rawResponse);
+
+            // WHEN
+            List<SurveyUnitModel> result = rawResponseService.convertRawResponse(rawResponses, variablesMap);
+
+            // THEN
+            List<SurveyUnitModel> collectedModels = result.stream()
+                    .filter(m -> m.getState() == DataState.COLLECTED)
+                    .toList();
+            Assertions.assertThat(collectedModels).hasSize(1);
+            Assertions.assertThat(collectedModels.getFirst().getExternalVariables()).hasSize(1);
+            Assertions.assertThat(collectedModels.getFirst().getExternalVariables().getFirst().varId()).isEqualTo("EXT1");
+        }
+
+        @Test
+        @DisplayName("Ignore empty models")
+        void convertRawResponse_shouldIgnoreEmptyResponse() {
+            // GIVEN
+            RawResponseModel rawResponse = buildEmptyRawResponse();
+            List<RawResponseModel> rawResponses = List.of(rawResponse);
+
+            // WHEN
+            List<SurveyUnitModel> result = rawResponseService.convertRawResponse(rawResponses, variablesMap);
+
+            // THEN
+            Assertions.assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("COLLECTED list management")
+        void convertRawResponse_shouldHandleListValues() {
+            // GIVEN
+            RawResponseModel rawResponse = buildRawResponseWithListVar("VAR_LIST", "COLLECTED", List.of("v1", "v2", "v3"));
+            List<RawResponseModel> rawResponses = List.of(rawResponse);
+
+            // WHEN
+            List<SurveyUnitModel> result = rawResponseService.convertRawResponse(rawResponses, variablesMap);
+
+            // THEN
+            List<SurveyUnitModel> collectedModels = result.stream()
+                    .filter(m -> m.getState() == DataState.COLLECTED)
+                    .toList();
+            Assertions.assertThat(collectedModels).hasSize(1);
+            // 3 valeurs non nulles => 3 VariableModel avec iterations 1,2,3
+            Assertions.assertThat(collectedModels.getFirst().getCollectedVariables()).hasSize(3);
+            Assertions.assertThat(collectedModels.getFirst().getCollectedVariables().get(0).iteration()).isEqualTo(1);
+            Assertions.assertThat(collectedModels.getFirst().getCollectedVariables().get(1).iteration()).isEqualTo(2);
+            Assertions.assertThat(collectedModels.getFirst().getCollectedVariables().get(2).iteration()).isEqualTo(3);
+        }
+
+        @Test
+        @DisplayName("Ignore null and empty values")
+        void convertRawResponse_shouldSkipNullOrEmptyListValues() {
+            // GIVEN
+            RawResponseModel rawResponse = buildRawResponseWithListVar("VAR_LIST", "COLLECTED", List.of("v1", "", "v3"));
+            List<RawResponseModel> rawResponses = List.of(rawResponse);
+
+            // WHEN
+            List<SurveyUnitModel> result = rawResponseService.convertRawResponse(rawResponses, variablesMap);
+
+            // THEN
+            List<SurveyUnitModel> collectedModels = result.stream()
+                    .filter(m -> m.getState() == DataState.COLLECTED)
+                    .toList();
+            Assertions.assertThat(collectedModels).hasSize(1);
+            Assertions.assertThat(collectedModels.getFirst().getCollectedVariables()).hasSize(2);
+        }
+
+        //UTILS
+
+        private RawResponseModel buildRawResponseWithVar(String varName, String stateKey, String value) {
+            RawResponseModel model = new RawResponseModel(
+                    null,
+                    TestConstants.DEFAULT_INTERROGATION_ID,
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                    Mode.WEB,
+                    new HashMap<>(),
+                    LocalDateTime.now(),
+                    null
+            );
+            Map<String, Object> dataMap = new HashMap<>();
+            Map<String, Object> collectedMap = new HashMap<>();
+            Map<String, Object> varStates = new HashMap<>();
+            varStates.put(stateKey, value);
+            collectedMap.put(varName, varStates);
+            dataMap.put("COLLECTED", collectedMap);
+            dataMap.put("EXTERNAL", new HashMap<>());
+            model.payload().put("data", dataMap);
+            return model;
+        }
+
+        private RawResponseModel buildRawResponseWithListVar(String varName, String stateKey, List<String> values) {
+            RawResponseModel model = new RawResponseModel(
+                    null,
+                    TestConstants.DEFAULT_INTERROGATION_ID,
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                    Mode.WEB,
+                    new HashMap<>(),
+                    LocalDateTime.now(),
+                    null
+            );
+            Map<String, Object> dataMap = new HashMap<>();
+            Map<String, Object> collectedMap = new HashMap<>();
+            Map<String, Object> varStates = new HashMap<>();
+            varStates.put(stateKey, values);
+            collectedMap.put(varName, varStates);
+            dataMap.put("COLLECTED", collectedMap);
+            dataMap.put("EXTERNAL", new HashMap<>());
+            model.payload().put("data", dataMap);
+            return model;
+        }
+
+        private RawResponseModel buildRawResponseWithCollectedAndExternal(
+                String collectedVarName, String collectedValue,
+                String externalVarName, String externalValue) {
+            RawResponseModel model = new RawResponseModel(
+                    null,
+                    TestConstants.DEFAULT_INTERROGATION_ID,
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                    Mode.WEB,
+                    new HashMap<>(),
+                    LocalDateTime.now(),
+                    null
+            );
+            Map<String, Object> dataMap = new HashMap<>();
+
+            Map<String, Object> collectedMap = new HashMap<>();
+            Map<String, Object> varStates = new HashMap<>();
+            varStates.put("COLLECTED", collectedValue);
+            collectedMap.put(collectedVarName, varStates);
+            dataMap.put("COLLECTED", collectedMap);
+
+            Map<String, Object> externalMap = new HashMap<>();
+            externalMap.put(externalVarName, externalValue);
+            dataMap.put("EXTERNAL", externalMap);
+
+            model.payload().put("data", dataMap);
+            return model;
+        }
+
+        private RawResponseModel buildEmptyRawResponse() {
+            RawResponseModel model = new RawResponseModel(
+                    null,
+                    TestConstants.DEFAULT_INTERROGATION_ID,
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID,
+                    Mode.WEB,
+                    new HashMap<>(),
+                    LocalDateTime.now(),
+                    null
+            );
+            Map<String, Object> dataMap = new HashMap<>();
+            dataMap.put("COLLECTED", new HashMap<>());
+            dataMap.put("EXTERNAL", new HashMap<>());
+            model.payload().put("data", dataMap);
+            return model;
+        }
+    }
+
+    @Test
+    @DisplayName("getRawResponses must call persistence port")
+    void getRawResponses_shouldDelegateToPersistencePort() {
+        // GIVEN
+        String collectionInstrumentId = TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+        Mode mode = Mode.WEB;
+        List<String> interrogationIds = List.of(TestConstants.DEFAULT_INTERROGATION_ID);
+        List<RawResponseModel> expected = List.of(mock(RawResponseModel.class));
+        doReturn(expected).when(rawResponsePersistencePort).findRawResponses(collectionInstrumentId, mode, interrogationIds);
+
+        // WHEN
+        List<RawResponseModel> result = rawResponseService.getRawResponses(collectionInstrumentId, mode, interrogationIds);
+
+        // THEN
+        Assertions.assertThat(result).isEqualTo(expected);
+    }
+
+    @Test
+    @DisplayName("getRawResponsesByInterrogationID must call persistence port")
+    void getRawResponsesByInterrogationID_shouldDelegateToPersistencePort() {
+        // GIVEN
+        String interrogationId = TestConstants.DEFAULT_INTERROGATION_ID;
+        List<RawResponseModel> expected = List.of(mock(RawResponseModel.class));
+        doReturn(expected).when(rawResponsePersistencePort).findRawResponsesByInterrogationID(interrogationId);
+
+        // WHEN
+        List<RawResponseModel> result = rawResponseService.getRawResponsesByInterrogationID(interrogationId);
+
+        // THEN
+        Assertions.assertThat(result).isEqualTo(expected);
+    }
+
+    @Test
+    @DisplayName("updateProcessDates must call persistence port for each collectionInstrumentId")
+    void updateProcessDates_shouldCallPersistencePortForEachCollectionInstrument() {
+        // GIVEN
+        SurveyUnitModel su1 = SurveyUnitModel.builder()
+                .collectionInstrumentId("QUEST1")
+                .interrogationId("INTERRO1")
+                .build();
+        SurveyUnitModel su2 = SurveyUnitModel.builder()
+                .collectionInstrumentId("QUEST1")
+                .interrogationId("INTERRO2")
+                .build();
+        SurveyUnitModel su3 = SurveyUnitModel.builder()
+                .collectionInstrumentId("QUEST2")
+                .interrogationId("INTERRO3")
+                .build();
+
+        // WHEN
+        rawResponseService.updateProcessDates(List.of(su1, su2, su3));
+
+        // THEN
+        ArgumentCaptor<String> collectionIdCaptor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<Set> interrogationIdsCaptor = ArgumentCaptor.forClass(Set.class);
+        verify(rawResponsePersistencePort, org.mockito.Mockito.times(2))
+                .updateProcessDates(collectionIdCaptor.capture(), interrogationIdsCaptor.capture());
+
+        Assertions.assertThat(collectionIdCaptor.getAllValues()).containsExactlyInAnyOrder("QUEST1", "QUEST2");
+    }
+
+    @Test
+    @DisplayName("getUnprocessedCollectionInstrumentIds should exclude no mode raw datas")
+    @SneakyThrows
+    void getUnprocessedCollectionInstrumentIds_shouldExclude_whenNoMode() {
+        // GIVEN
+        doReturn(List.of("QUEST_NO_MODE")).when(rawResponsePersistencePort).getUnprocessedCollectionIds();
+        doReturn(Collections.emptyList()).when(rawResponsePersistencePort).findModesByCollectionInstrument("QUEST_NO_MODE");
+
+        // WHEN + THEN
+        Assertions.assertThat(rawResponseService.getUnprocessedCollectionInstrumentIds()).isEmpty();
+    }
+
+    @Test
+    @DisplayName("getUnprocessedCollectionInstrumentIds should exclude raw datas with only null")
+    @SneakyThrows
+    void getUnprocessedCollectionInstrumentIds_shouldExclude_whenOnlyNullMode() {
+        // GIVEN
+        doReturn(List.of("QUEST_NULL_MODE")).when(rawResponsePersistencePort).getUnprocessedCollectionIds();
+        List<ModeDto> modesWithNull = new ArrayList<>();
+        modesWithNull.add(null);
+        doReturn(modesWithNull).when(rawResponsePersistencePort).findModesByCollectionInstrument("QUEST_NULL_MODE");
+
+        // WHEN + THEN
+        Assertions.assertThat(rawResponseService.getUnprocessedCollectionInstrumentIds()).isEmpty();
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/rundeck/RundeckExecutionServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/rundeck/RundeckExecutionServiceTest.java
index a24c98d0..f90dff1a 100644
--- a/src/test/java/fr/insee/genesis/domain/service/rundeck/RundeckExecutionServiceTest.java
+++ b/src/test/java/fr/insee/genesis/domain/service/rundeck/RundeckExecutionServiceTest.java
@@ -1,71 +1,40 @@
 package fr.insee.genesis.domain.service.rundeck;
 
-import fr.insee.genesis.domain.model.rundeck.DateStarted;
-import fr.insee.genesis.domain.model.rundeck.Job;
 import fr.insee.genesis.domain.model.rundeck.RundeckExecution;
-import fr.insee.genesis.stubs.RundeckExecutionPersistencePortStub;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import fr.insee.genesis.domain.ports.spi.RundeckExecutionPersistencePort;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-class RundeckExecutionServiceTest {
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
-    static RundeckExecutionPersistencePortStub rundeckPersistencePortStub;
+@ExtendWith(MockitoExtension.class)
+class RundeckExecutionServiceUnitTest {
 
-    static RundeckExecutionService rundeckExecutionService;
+    private RundeckExecutionService rundeckExecutionService;
 
-    @BeforeAll
-    static void init(){
-        rundeckPersistencePortStub = new RundeckExecutionPersistencePortStub();
-        rundeckExecutionService = new RundeckExecutionService(rundeckPersistencePortStub);
+    @Mock
+    private RundeckExecutionPersistencePort rundeckExecutionPersistencePort;
+
+    @BeforeEach
+    void init() {
+        rundeckExecutionService = new RundeckExecutionService(rundeckExecutionPersistencePort);
     }
 
     @Test
-    void addRundeckExecution_test()  {
-        //GIVEN
-        DateStarted dateStarted = new DateStarted();
-        dateStarted.setUnixtime(1737643070029L);
-        dateStarted.setDate("2025-01-23T14:37:50Z");
-
-        Job job = new Job();
-        job.setIdJob("9506a45d-79e3-42d9-afb4-c8f59652c676");
-        job.setAverageDuration(8817);
-        job.setName("TEST");
-        job.setGroup("");
-        job.setProject("project-test");
-        job.setDescription("job de test qui attend 8 s et retourne OK");
-        job.setHref("https://example-url");
-        job.setPermalink("https://example-url");
-
-        // Création de l'objet RundeckExecution
+    @DisplayName("addExecution should call persistencePort")
+    void addExecution_shouldDelegateToPersistencePort() {
+        // GIVEN
         RundeckExecution execution = new RundeckExecution();
-        execution.setIdExecution(1747563);
-        execution.setHref("https://example-url");
-        execution.setPermalink("https://example-url");
-        execution.setStatus("running");
-        execution.setProject("project-test");
-        execution.setExecutionType("user");
-        execution.setUser("project-test");
-        execution.setDateStarted(dateStarted);
-        execution.setJob(job);
-        execution.setDescription("A very usefull description");
-        execution.setArgstring(null);
-        execution.setServerUUID("e9ff62c2-b621-4b31-827e-9d47f0c34310");
 
-        //WHEN
+        // WHEN
         rundeckExecutionService.addExecution(execution);
 
-        //THEN
-        Assertions.assertThat(rundeckPersistencePortStub.getMongoStub()).hasSize(1);
-        Assertions.assertThat(rundeckPersistencePortStub.getMongoStub().getFirst().getIdExecution()).isEqualTo(1747563);
-        Assertions.assertThat(rundeckPersistencePortStub.getMongoStub().getFirst().getStatus()).isEqualTo("running");
-
-        Assertions.assertThat(rundeckPersistencePortStub.getMongoStub().getFirst().getUser()).isEqualTo("project-test");
-        Assertions.assertThat(rundeckPersistencePortStub.getMongoStub().getFirst().getProject()).isEqualTo("project-test");
-        Assertions.assertThat(rundeckPersistencePortStub.getMongoStub().getFirst().getDateStarted().getUnixtime()).isEqualTo(1737643070029L);
-        Assertions.assertThat(rundeckPersistencePortStub.getMongoStub().getFirst().getJob().getIdJob()).isEqualTo("9506a45d-79e3-42d9-afb4-c8f59652c676");
-
+        // THEN
+        verify(rundeckExecutionPersistencePort, times(1)).save(execution);
     }
-
-
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityServiceTest.java
new file mode 100644
index 00000000..57f9cb73
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityServiceTest.java
@@ -0,0 +1,186 @@
+package fr.insee.genesis.domain.service.surveyunit;
+
+import fr.insee.bpm.metadata.model.VariablesMap;
+import fr.insee.genesis.controller.dto.VariableInputDto;
+import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
+import fr.insee.genesis.domain.utils.DataVerifier;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class SurveyUnitQualityServiceUnitTest {
+
+    private SurveyUnitQualityService surveyUnitQualityService;
+
+    @BeforeEach
+    void init() {
+        surveyUnitQualityService = new SurveyUnitQualityService();
+    }
+
+    @Nested
+    @DisplayName("verifySurveyUnits tests")
+    class VerifySurveyUnitsTests {
+
+        @Test
+        @DisplayName("Should call dataVerifier")
+        void verifySurveyUnits_shouldDelegateToDataVerifier() {
+            // GIVEN
+            List<SurveyUnitModel> surveyUnitModels = List.of(new SurveyUnitModel());
+            VariablesMap variablesMap = new VariablesMap();
+
+            try (MockedStatic<DataVerifier> dataVerifierMock = mockStatic(DataVerifier.class)) {
+                // WHEN
+                surveyUnitQualityService.verifySurveyUnits(surveyUnitModels, variablesMap);
+
+                // THEN
+                dataVerifierMock.verify(() ->
+                        DataVerifier.verifySurveyUnits(surveyUnitModels, variablesMap)
+                );
+            }
+        }
+
+        @Test
+        @DisplayName("Should handle empty lists of surveyUnitModels")
+        void verifySurveyUnits_shouldHandleEmptyList() {
+            // GIVEN
+            VariablesMap variablesMap = new VariablesMap();
+
+            try (MockedStatic<DataVerifier> dataVerifierMock = mockStatic(DataVerifier.class)) {
+                // WHEN
+                surveyUnitQualityService.verifySurveyUnits(Collections.emptyList(), variablesMap);
+
+                // THEN
+                dataVerifierMock.verify(() ->
+                        DataVerifier.verifySurveyUnits(Collections.emptyList(), variablesMap)
+                );
+            }
+        }
+    }
+
+    @Nested
+    @DisplayName("checkVariablesPresentInMetadata tests")
+    class CheckVariablesPresentInMetadataTests {
+
+        @Test
+        @DisplayName("Should return empty list if all variables present")
+        void checkVariablesPresentInMetadata_shouldReturnEmpty_whenAllPresent() {
+            // GIVEN
+            VariablesMap variablesMap = mock(VariablesMap.class);
+            VariableInputDto var1 = VariableInputDto.builder()
+                    .variableName("VAR1")
+                    .build();
+            VariableInputDto var2 = VariableInputDto.builder()
+                    .variableName("VAR2")
+                    .build();
+            when(variablesMap.hasVariable("VAR1")).thenReturn(true);
+            when(variablesMap.hasVariable("VAR2")).thenReturn(true);
+
+            // WHEN
+            List<String> result = surveyUnitQualityService.checkVariablesPresentInMetadata(
+                    List.of(var1, var2), variablesMap
+            );
+
+            // THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should return absent variables")
+        void checkVariablesPresentInMetadata_shouldReturnAbsentVariables() {
+            // GIVEN
+            VariablesMap variablesMap = mock(VariablesMap.class);
+            VariableInputDto var1 = VariableInputDto.builder()
+                    .variableName("VAR_PRESENT")
+                    .build();
+            VariableInputDto var2 = VariableInputDto.builder()
+                    .variableName("VAR_ABSENT")
+                    .build();
+            when(variablesMap.hasVariable("VAR_PRESENT")).thenReturn(true);
+            when(variablesMap.hasVariable("VAR_ABSENT")).thenReturn(false);
+
+            // WHEN
+            List<String> result = surveyUnitQualityService.checkVariablesPresentInMetadata(
+                    List.of(var1, var2), variablesMap
+            );
+
+            // THEN
+            assertThat(result).containsExactly("VAR_ABSENT");
+        }
+
+        @Test
+        @DisplayName("Should return all variables if all variables are absent")
+        void checkVariablesPresentInMetadata_shouldReturnAll_whenNonePresent() {
+            // GIVEN
+            VariablesMap variablesMap = mock(VariablesMap.class);
+            VariableInputDto var1 = VariableInputDto.builder()
+                    .variableName("VAR1")
+                    .build();
+            VariableInputDto var2 = VariableInputDto.builder()
+                    .variableName("VAR2")
+                    .build();
+            when(variablesMap.hasVariable("VAR1")).thenReturn(false);
+            when(variablesMap.hasVariable("VAR2")).thenReturn(false);
+
+            // WHEN
+            List<String> result = surveyUnitQualityService.checkVariablesPresentInMetadata(
+                    List.of(var1, var2), variablesMap
+            );
+
+            // THEN
+            assertThat(result).containsExactlyInAnyOrder("VAR1", "VAR2");
+        }
+
+        @Test
+        @DisplayName("Should return empty list if called with empty list")
+        void checkVariablesPresentInMetadata_shouldReturnEmpty_whenInputIsEmpty() {
+            // GIVEN
+            VariablesMap variablesMap = mock(VariablesMap.class);
+
+            // WHEN
+            List<String> result = surveyUnitQualityService.checkVariablesPresentInMetadata(
+                    Collections.emptyList(), variablesMap
+            );
+
+            // THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should preserve order of present variables")
+        void checkVariablesPresentInMetadata_shouldPreserveOrder() {
+            // GIVEN
+            VariablesMap variablesMap = mock(VariablesMap.class);
+            List<VariableInputDto> inputs = List.of(
+                    VariableInputDto.builder()
+                            .variableName("C")
+                            .build(),
+                    VariableInputDto.builder()
+                            .variableName("A")
+                            .build(),
+                    VariableInputDto.builder()
+                            .variableName("B")
+                            .build()
+            );
+            inputs.forEach(v -> when(variablesMap.hasVariable(v.getVariableName())).thenReturn(false));
+
+            // WHEN
+            List<String> result = surveyUnitQualityService.checkVariablesPresentInMetadata(inputs, variablesMap);
+
+            // THEN
+            assertThat(result).containsExactly("C", "A", "B");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java
deleted file mode 100644
index 8cb4453b..00000000
--- a/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java
+++ /dev/null
@@ -1,785 +0,0 @@
-package fr.insee.genesis.domain.service.surveyunit;
-
-import fr.insee.genesis.controller.dto.SurveyUnitDto;
-import fr.insee.genesis.controller.dto.VariableDto;
-import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.model.surveyunit.VariableModel;
-import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
-import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
-import lombok.SneakyThrows;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-import java.time.Month;
-import java.util.ArrayList;
-import java.util.List;
-
-import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_SURVEY_UNIT_ID;
-
-class SurveyUnitServiceTest {
-    
-    //Given
-    static SurveyUnitService surveyUnitServiceStatic;
-    static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
-
-    //Constants
-
-    @BeforeAll
-    static void init(){
-        surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
-
-        surveyUnitServiceStatic = new SurveyUnitService(surveyUnitPersistencePortStub,
-                new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub()),
-                new FileUtils(new ConfigStub()));
-    }
-
-    @BeforeEach
-    void reset(){
-        surveyUnitPersistencePortStub.getMongoStub().clear();
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(variable);
-        variable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(variable);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-        collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .scope("TESTSCOPE")
-                .iteration(2)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-        surveyUnitPersistencePortStub.getMongoStub().add(SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .usualSurveyUnitId(DEFAULT_SURVEY_UNIT_ID)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .state(DataState.COLLECTED)
-                .fileDate(LocalDateTime.of(2023,1,1,0,0,0))
-                .recordDate(LocalDateTime.of(2024,1,1,0,0,0))
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build());
-    }
-
-    //When + Then
-    @Test
-    @DisplayName("The survey unit should be saved into DB")
-    void saveAllTest(){
-        List<SurveyUnitModel> newSurveyUnitModelList = new ArrayList<>();
-
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel externalVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(externalVariableModel);
-        externalVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(externalVariableModel);
-
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariableModel);
-        collectedVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .scope("TESTSCOPE")
-                .iteration(2)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariableModel);
-
-        newSurveyUnitModelList.add(
-                SurveyUnitModel.builder()
-                        .campaignId("TEST-TABLEAUX")
-                        .mode(Mode.WEB)
-                        .usualSurveyUnitId(DEFAULT_SURVEY_UNIT_ID)
-                        .interrogationId("TESTINTERROGATIONID2")
-                        .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                        .state(DataState.COLLECTED)
-                        .fileDate(LocalDateTime.of(2023,1,1,0,0,0))
-                        .recordDate(LocalDateTime.of(2024,1,1,0,0,0))
-                        .externalVariables(externalVariableList)
-                        .collectedVariables(collectedVariableList)
-                        .build()
-        );
-
-        surveyUnitServiceStatic.saveSurveyUnits(newSurveyUnitModelList);
-
-        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).filteredOn(surveyUnitModel ->
-                        surveyUnitModel.getCampaignId().equals("TEST-TABLEAUX")
-                        && surveyUnitModel.getMode().equals(Mode.WEB)
-                        && surveyUnitModel.getInterrogationId().equals("TESTINTERROGATIONID2")
-                        && surveyUnitModel.getCollectionInstrumentId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                        && surveyUnitModel.getState().equals(DataState.COLLECTED)
-                        && surveyUnitModel.getFileDate().equals(LocalDateTime.of(2023,1,1,0,0,0))
-                        && surveyUnitModel.getRecordDate().equals(LocalDateTime.of(2024,1,1,0,0,0))
-                        && !surveyUnitModel.getExternalVariables().stream().filter(
-                                externalVariable -> externalVariable.varId().equals("TESTVARID")
-                                        && externalVariable.iteration().equals(1)
-                                        && externalVariable.value().equals("V1")
-                        ).toList().isEmpty()
-                        && !surveyUnitModel.getCollectedVariables().stream().filter(
-                                collectedVariable -> collectedVariable.varId().equals("TESTVARID")
-                                        && collectedVariable.iteration().equals(2)
-                                        && collectedVariable.value().equals("V2")
-                        ).toList().isEmpty()
-                ).isNotEmpty();
-    }
-
-    @Test
-    void findByIdsUEAndQuestionnaireTest(){
-        Assertions.assertThat(surveyUnitServiceStatic.findByIdsInterrogationAndCollectionInstrument(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                surveyUnitModel ->
-                        surveyUnitModel.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-                        && surveyUnitModel.getCollectionInstrumentId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-        ).isNotEmpty();
-    }
-
-   @Test
-    void findByIdsUsualSurveyUnitAndCollectionInstrumentTest(){
-        Assertions.assertThat(surveyUnitServiceStatic.findByIdsUsualSurveyUnitAndCollectionInstrument(DEFAULT_SURVEY_UNIT_ID, DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                surveyUnitModel ->
-                        surveyUnitModel.getUsualSurveyUnitId().equals(DEFAULT_SURVEY_UNIT_ID)
-                        && surveyUnitModel.getCollectionInstrumentId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-        ).isNotEmpty();
-    }
-
-    @Test
-    void findByInterrogationIdTest(){
-        Assertions.assertThat(surveyUnitServiceStatic.findByInterrogationId(DEFAULT_INTERROGATION_ID)).filteredOn(
-                surveyUnitModel ->
-                        surveyUnitModel.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-        ).isNotEmpty();
-    }
-
-    @Test
-    void findLatestByIdAndByModeTest(){
-        addAdditionnalSurveyUnitModelToMongoStub();
-
-        Assertions.assertThat(surveyUnitServiceStatic.findLatestByIdAndByCollectionInstrumentId(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                surveyUnitModel -> surveyUnitModel.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-                && surveyUnitModel.getCollectionInstrumentId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                && surveyUnitModel.getFileDate().getMonth().equals(Month.FEBRUARY)
-        ).isNotEmpty();
-    }
-
-    @Test
-    void findResponsesByUEAndQuestionnaireTest_null_collectedVariables() {
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C NEW E",
-                "E NEW E",
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0)
-        );
-        surveyUnitPersistencePortStub.getMongoStub().getLast().setCollectedVariables(null);
-
-        Assertions.assertThat(surveyUnitServiceStatic.findLatestByIdAndByCollectionInstrumentId(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                surveyUnitModel -> surveyUnitModel.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-                        && surveyUnitModel.getCollectionInstrumentId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                        && surveyUnitModel.getFileDate().getMonth().equals(Month.FEBRUARY)
-        ).isNotEmpty();
-    }
-    @Test
-    void findResponsesByUEAndQuestionnaireTest_null_externalVariables() {
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C NEW E",
-                "E NEW E",
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0)
-        );
-        surveyUnitPersistencePortStub.getMongoStub().getLast().setExternalVariables(null);
-
-        Assertions.assertThat(surveyUnitServiceStatic.findLatestByIdAndByCollectionInstrumentId(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                surveyUnitModel -> surveyUnitModel.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-                        && surveyUnitModel.getCollectionInstrumentId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                        && surveyUnitModel.getFileDate().getMonth().equals(Month.FEBRUARY)
-        ).isNotEmpty();
-    }
-
-    @Test
-    void findDistinctInterrogationIdsByQuestionnaireIdTest(){
-        addAdditionnalSurveyUnitModelToMongoStub();
-
-        Assertions.assertThat(surveyUnitServiceStatic.findDistinctInterrogationIdsByQuestionnaireId(DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-        ).isNotEmpty().hasSize(1);
-    }
-
-    @Test
-    void findDistinctInterrogationIdsByQuestionnaireIdAndDateAfterTest_no_doc_in_period(){
-        addAdditionnalSurveyUnitModelToMongoStub();
-
-        Assertions.assertThat(surveyUnitServiceStatic.findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(DEFAULT_COLLECTION_INSTRUMENT_ID,LocalDateTime.of(2025,9,1,0,0,0))).filteredOn(
-                interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-        ).isEmpty();
-    }
-
-    @Test
-    void findDistinctInterrogationIdsByQuestionnaireIdAndDateAfterTest_doc_in_period(){
-        addAdditionnalSurveyUnitModelToMongoStub();
-
-        Assertions.assertThat(surveyUnitServiceStatic.findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(DEFAULT_COLLECTION_INSTRUMENT_ID,LocalDateTime.of(2022,1,1,0,0,0))).filteredOn(
-                interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID)
-        ).isNotEmpty().hasSize(1);
-    }
-
-    @Test
-    void findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetweenTest_no_doc_in_period() {
-        addAdditionnalSurveyUnitModelToMongoStub();
-
-        LocalDateTime start = LocalDateTime.of(2025, 9, 1, 0, 0, 0);
-        LocalDateTime end   = LocalDateTime.of(2025, 9, 2, 0, 0, 0);
-
-        Assertions.assertThat(
-                        surveyUnitServiceStatic.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
-                                DEFAULT_COLLECTION_INSTRUMENT_ID, start, end
-                        )
-                ).filteredOn(interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID))
-                .isEmpty();
-    }
-
-    @Test
-    void findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetweenTest_doc_in_period() {
-        addAdditionnalSurveyUnitModelToMongoStub();
-
-        LocalDateTime start = LocalDateTime.of(2022, 1, 1, 0, 0, 0);
-        LocalDateTime end   = LocalDateTime.of(2026, 1, 1, 0, 0, 0);
-
-        Assertions.assertThat(
-                        surveyUnitServiceStatic.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
-                                DEFAULT_COLLECTION_INSTRUMENT_ID, start, end
-                        )
-                ).filteredOn(interrogationId -> interrogationId.getInterrogationId().equals(DEFAULT_INTERROGATION_ID))
-                .isNotEmpty()
-                .hasSize(1);
-    }
-
-    @Test
-    void findInterrogationIdsByQuestionnaireIdTest(){
-        Assertions.assertThat(surveyUnitServiceStatic.findModesByCollectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                mode -> mode.equals(Mode.WEB)
-        ).isNotEmpty();
-    }
-
-    //========= OPTIMISATIONS PERFS (START) ==========
-    @Test
-    void findModesByQuestionnaireIdV2Test(){
-        Assertions.assertThat(surveyUnitServiceStatic.findModesByQuestionnaireIdV2(DEFAULT_COLLECTION_INSTRUMENT_ID)).filteredOn(
-                mode -> mode.equals(Mode.WEB)
-        ).isNotEmpty();
-    }
-    //========= OPTIMISATIONS PERFS (END) ==========
-
-    @Test
-    void getQuestionnairesByCampaignTest() {
-        addAdditionnalSurveyUnitModelToMongoStub("TESTQUESTIONNAIRE2");
-
-        Assertions.assertThat(surveyUnitServiceStatic.findQuestionnaireIdsByCampaignId("TEST-TABLEAUX")).isNotEmpty().hasSize(2);
-
-    }
-
-    @Test
-    void getAllCampaignsTest() {
-        Assertions.assertThat(surveyUnitServiceStatic.findDistinctCampaignIds()).contains("TEST-TABLEAUX");
-    }
-
-    @Test
-    @SneakyThrows
-    void findLatestByIdAndByQuestionnaireIdPerretTest(){
-        //Given
-        //Recent Collected already in stub
-        //Old Collected
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.COLLECTED,
-                "C OLD C", //<Collected/External> <NEW or OLD> <Collected/Edited>
-            "E OLD C",
-            LocalDateTime.of(1999,2,2,0,0,0),
-            LocalDateTime.of(1999,2,2,0,0,0)
-        );
-
-        //Recent Edited
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C NEW E",
-                "E NEW E",
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0)
-        );
-
-        //Old Edited
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C OLD E",
-                "E OLD E",
-                LocalDateTime.of(1999,2,2,0,0,0),
-                LocalDateTime.of(1999,2,2,0,0,0)
-        );
-
-
-        //When
-        SurveyUnitDto surveyUnitDto = surveyUnitServiceStatic.findLatestValuesByStateByIdAndByCollectionInstrumentId(
-                DEFAULT_INTERROGATION_ID,
-                DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
-
-
-        //Then
-        Assertions.assertThat(surveyUnitDto.getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-
-        List<VariableDto> variableDtos = surveyUnitDto.getCollectedVariables().stream().filter(
-                variableDto -> variableDto.getVariableName().equals("TESTVARID")
-                && variableDto.getIteration() == 1
-        ).toList();
-        Assertions.assertThat(variableDtos).hasSize(1);
-
-        Assertions.assertThat(variableDtos.getFirst().getVariableName())
-                .isEqualTo("TESTVARID");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                            variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("C NEW E");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                .stream().filter(
-                        variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                ).toList().getFirst().isActive())
-                .isFalse();
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                .stream().filter(
-                        variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                ).toList().getFirst().isActive())
-                .isTrue();
-
-        Assertions.assertThat(surveyUnitDto.getExternalVariables().getFirst().getVariableName())
-                .isEqualTo("TESTVARID");
-        Assertions.assertThat(surveyUnitDto.getExternalVariables().getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(surveyUnitDto.getExternalVariables().getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("E NEW E");
-        Assertions.assertThat(surveyUnitDto.getExternalVariables().getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().isActive())
-                .isFalse();
-        Assertions.assertThat(surveyUnitDto.getExternalVariables().getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().isActive())
-                .isTrue();
-    }
-
-    @Test
-    @SneakyThrows
-    void findLatestByIdAndByQuestionnaireIdPerretTest_null_collectedVariables(){
-        //Given
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C NEW E",
-                "E NEW E",
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0)
-        );
-        surveyUnitPersistencePortStub.getMongoStub().getLast().setCollectedVariables(null);
-
-
-        //When
-        SurveyUnitDto surveyUnitDto = surveyUnitServiceStatic.findLatestValuesByStateByIdAndByCollectionInstrumentId(
-                DEFAULT_INTERROGATION_ID,
-                DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
-
-
-        //Then
-        Assertions.assertThat(surveyUnitDto.getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-
-        List<VariableDto> variableDtos = surveyUnitDto.getCollectedVariables().stream().filter(
-                variableDto -> variableDto.getVariableName().equals("TESTVARID")
-                        && variableDto.getIteration() == 1
-        ).toList();
-        Assertions.assertThat(variableDtos).hasSize(1);
-
-        Assertions.assertThat(variableDtos.getFirst().getVariableName())
-                .isEqualTo("TESTVARID");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().isActive())
-                .isTrue();
-
-
-
-        variableDtos = surveyUnitDto.getExternalVariables().stream().filter(
-                variableDto -> variableDto.getVariableName().equals("TESTVARID")
-                        && variableDto.getIteration() == 1
-        ).toList();
-        Assertions.assertThat(variableDtos).hasSize(1);
-
-        Assertions.assertThat(variableDtos.getFirst().getVariableName())
-                .isEqualTo("TESTVARID");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("E NEW E");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().isActive())
-                .isFalse();
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().isActive())
-                .isTrue();
-    }
-
-    @Test
-    @SneakyThrows
-    void findLatestByIdAndByQuestionnaireIdPerretTest_null_externalVariables(){
-        //Given
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "C NEW E",
-                "E NEW E",
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0)
-        );
-        surveyUnitPersistencePortStub.getMongoStub().getLast().setExternalVariables(null);
-
-
-        //When
-        SurveyUnitDto surveyUnitDto = surveyUnitServiceStatic.findLatestValuesByStateByIdAndByCollectionInstrumentId(
-                DEFAULT_INTERROGATION_ID,
-                DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
-
-
-        //Then
-        Assertions.assertThat(surveyUnitDto.getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
-
-        List<VariableDto> variableDtos = surveyUnitDto.getCollectedVariables().stream().filter(
-                variableDto -> variableDto.getVariableName().equals("TESTVARID")
-                        && variableDto.getIteration() == 1
-        ).toList();
-        Assertions.assertThat(variableDtos).hasSize(1);
-
-        Assertions.assertThat(variableDtos.getFirst().getVariableName())
-                .isEqualTo("TESTVARID");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("C NEW E");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().isActive())
-                .isFalse();
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.EDITED)
-                        ).toList().getFirst().isActive())
-                .isTrue();
-
-        variableDtos = surveyUnitDto.getExternalVariables().stream().filter(
-                variableDto -> variableDto.getVariableName().equals("TESTVARID")
-                        && variableDto.getIteration() == 1
-        ).toList();
-        Assertions.assertThat(variableDtos).hasSize(1);
-
-        Assertions.assertThat(variableDtos.getFirst().getVariableName())
-                .isEqualTo("TESTVARID");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().getValue())
-                .isEqualTo("V1");
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()
-                        .stream().filter(
-                                variableStatePerret -> variableStatePerret.getState().equals(DataState.COLLECTED)
-                        ).toList().getFirst().isActive())
-                .isTrue();
-    }
-
-    @Test
-    @SneakyThrows
-    void findLatestValuesByStateByIdAndByQuestionnaireId_should_return_empty_values_too(){
-        //Given
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.FORCED,
-                "",
-                "",
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0)
-        );
-
-        //When
-        SurveyUnitDto surveyUnitDto = surveyUnitServiceStatic.findLatestValuesByStateByIdAndByCollectionInstrumentId(
-                DEFAULT_INTERROGATION_ID,
-                DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
-        List<VariableDto> variableDtos = surveyUnitDto.getCollectedVariables().stream().filter(
-                variableDto -> variableDto.getVariableName().equals("TESTVARID")
-                        && variableDto.getIteration() == 1
-        ).toList();
-        //THEN
-        Assertions.assertThat(variableDtos).isNotEmpty();
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()).hasSize(2);
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList().getFirst().getValue().toString()).isEmpty();
-
-    }
-
-    @Test
-    @SneakyThrows
-    void findLatestValuesByStateByIdAndByQuestionnaireId_should_return_null_values(){
-        //Given
-        addAdditionnalSurveyUnitModelToMongoStub(DataState.EDITED,
-                "TABLEAUTIC11",
-                null,
-                null,
-                LocalDateTime.of(2025,2,2,0,0,0),
-                LocalDateTime.of(2025,2,2,0,0,0)
-        );
-
-        //When
-        SurveyUnitDto surveyUnitDto = surveyUnitServiceStatic.findLatestValuesByStateByIdAndByCollectionInstrumentId(
-                DEFAULT_INTERROGATION_ID,
-                DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
-        List<VariableDto> variableDtos = surveyUnitDto.getCollectedVariables().stream().filter(
-                variableDto -> variableDto.getVariableName().equals("TABLEAUTIC11")
-                        && variableDto.getIteration() == 1
-        ).toList();
-        //THEN
-        Assertions.assertThat(variableDtos).isNotEmpty();
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList()).hasSize(1);
-        Assertions.assertThat(variableDtos.getFirst().getVariableStateDtoList().getFirst().getValue()).isNull();
-
-    }
-
-    private void addAdditionnalSurveyUnitModelToMongoStub(){
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel externalVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(externalVariableModel);
-        externalVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(externalVariableModel);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariableModel);
-
-        SurveyUnitModel recentDTO = SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .state(DataState.COLLECTED)
-                .fileDate(LocalDateTime.of(2023,2,2,0,0,0))
-                .recordDate(LocalDateTime.of(2024,2,2,0,0,0))
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentDTO);
-    }
-
-    private void addAdditionnalSurveyUnitModelToMongoStub(String questionnaireId) {
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel externalVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .iteration(1)
-                .build();
-        externalVariableList.add(externalVariableModel);
-        externalVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .iteration(2)
-                .build();
-        externalVariableList.add(externalVariableModel);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V1")
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariableModel);
-        collectedVariableModel = VariableModel.builder()
-                .varId("TESTVARID")
-                .value("V2")
-                .scope("TESTSCOPE")
-                .iteration(2)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariableModel);
-
-        SurveyUnitModel recentDTO = SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(questionnaireId)
-                .state(DataState.COLLECTED)
-                .fileDate(LocalDateTime.of(2023, 2, 2, 0, 0, 0))
-                .recordDate(LocalDateTime.of(2024, 2, 2, 0, 0, 0))
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentDTO);
-    }
-
-    private void addAdditionnalSurveyUnitModelToMongoStub(DataState state,
-                                                          String collectedVariableValue,
-                                                          String externalVariableValue,
-                                                          LocalDateTime fileDate,
-                                                          LocalDateTime recordDate) {
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel externalVariableModel =
-                VariableModel.builder()
-                        .varId("TESTVARID")
-                        .value(externalVariableValue)
-                        .iteration(1)
-                        .build();
-        externalVariableList.add(externalVariableModel);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId("TESTVARID")
-                .value(collectedVariableValue)
-                .scope("TESTSCOPE")
-                .iteration(1)
-                .parentId("TESTPARENTID")
-                .build();
-        collectedVariableList.add(collectedVariable);
-
-        SurveyUnitModel recentDTO = SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .state(state)
-                .fileDate(fileDate)
-                .recordDate(recordDate)
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentDTO);
-    }
-
-    private void addAdditionnalSurveyUnitModelToMongoStub(DataState state,
-                                                          String varId,
-                                                          String collectedVariableValue,
-                                                          String externalVariableValue,
-                                                          LocalDateTime fileDate,
-                                                          LocalDateTime recordDate) {
-        List<VariableModel> externalVariableList = new ArrayList<>();
-        VariableModel externalVariableModel =
-                VariableModel.builder()
-                        .varId(varId)
-                        .value(externalVariableValue)
-                        .iteration(1)
-                        .build();
-        externalVariableList.add(externalVariableModel);
-
-        List<VariableModel> collectedVariableList = new ArrayList<>();
-        VariableModel collectedVariable = VariableModel.builder()
-                .varId(varId)
-                .value(collectedVariableValue)
-                .scope("RACINE")
-                .iteration(1)
-                .parentId(null)
-                .build();
-        collectedVariableList.add(collectedVariable);
-
-        SurveyUnitModel recentDTO = SurveyUnitModel.builder()
-                .campaignId("TEST-TABLEAUX")
-                .mode(Mode.WEB)
-                .interrogationId(DEFAULT_INTERROGATION_ID)
-                .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
-                .state(state)
-                .fileDate(fileDate)
-                .recordDate(recordDate)
-                .externalVariables(externalVariableList)
-                .collectedVariables(collectedVariableList)
-                .build();
-        surveyUnitPersistencePortStub.getMongoStub().add(recentDTO);
-    }
-}
diff --git a/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceUnitTest.java b/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceUnitTest.java
index 5ebb7d65..d2cdd078 100644
--- a/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceUnitTest.java
+++ b/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceUnitTest.java
@@ -1,57 +1,71 @@
 package fr.insee.genesis.domain.service.surveyunit;
 
+import fr.insee.bpm.metadata.model.MetadataModel;
+import fr.insee.bpm.metadata.model.Variable;
+import fr.insee.bpm.metadata.model.VariableType;
+import fr.insee.bpm.metadata.model.VariablesMap;
 import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
+import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
+import fr.insee.genesis.controller.dto.SurveyUnitInputDto;
 import fr.insee.genesis.controller.dto.SurveyUnitSimplifiedDto;
+import fr.insee.genesis.controller.dto.VariableInputDto;
+import fr.insee.genesis.controller.dto.VariableStateInputDto;
 import fr.insee.genesis.domain.model.surveyunit.DataState;
+import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
+import fr.insee.genesis.domain.model.surveyunit.VariableModel;
 import fr.insee.genesis.domain.ports.spi.SurveyUnitPersistencePort;
 import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
+import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.exceptions.QuestionnaireNotFoundException;
 import fr.insee.genesis.infrastructure.document.surveyunit.SurveyUnitDocument;
 import fr.insee.genesis.infrastructure.document.surveyunit.VariableDocument;
 import fr.insee.genesis.infrastructure.mappers.SurveyUnitDocumentMapper;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
-import fr.insee.genesis.stubs.ConfigStub;
-import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
+import cucumber.stubs.SurveyUnitPersistencePortStub;
 import lombok.SneakyThrows;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 class SurveyUnitServiceUnitTest {
-    
+
     //Given
     static SurveyUnitService surveyUnitService;
     static SurveyUnitPersistencePort surveyUnitPersistencePortStub;
     static QuestionnaireMetadataService questionnaireMetadataServiceStub;
 
     @BeforeEach
-    void init(){
+    void init() {
         surveyUnitPersistencePortStub = mock(SurveyUnitPersistencePortStub.class);
-
-
-
         questionnaireMetadataServiceStub = mock(QuestionnaireMetadataService.class);
-
         surveyUnitService = new SurveyUnitService(
                 surveyUnitPersistencePortStub,
                 questionnaireMetadataServiceStub,
-                new FileUtils(new ConfigStub())
+                new FileUtils(TestConstants.getConfigStub())
         );
     }
 
     @Test
-    void get_latest_should_return_usualSurveyId(){
-        //GIVEN
+    void get_latest_should_return_usualSurveyId() {
         SurveyUnitDocument surveyUnitDocument = new SurveyUnitDocument();
         surveyUnitDocument.setMode(String.valueOf(Mode.WEB));
         surveyUnitDocument.setUsualSurveyUnitId(TestConstants.DEFAULT_SURVEY_UNIT_ID);
@@ -61,16 +75,13 @@ void get_latest_should_return_usualSurveyId(){
         doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(Collections.singletonList(surveyUnitDocument)))
                 .when(surveyUnitPersistencePortStub).findByIds(any(), any());
 
-        //WHEN
         List<SurveyUnitModel> surveyUnitModels = surveyUnitService.findLatestByIdAndByCollectionInstrumentId(
                 TestConstants.DEFAULT_INTERROGATION_ID,
                 TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
         );
 
-        //THEN
-        Assertions.assertThat(surveyUnitModels).isNotNull().hasSize(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getUsualSurveyUnitId()).isEqualTo(TestConstants.DEFAULT_SURVEY_UNIT_ID);
-
+        assertThat(surveyUnitModels).isNotNull().hasSize(1);
+        assertThat(surveyUnitModels.getFirst().getUsualSurveyUnitId()).isEqualTo(TestConstants.DEFAULT_SURVEY_UNIT_ID);
     }
 
     @Test
@@ -280,8 +291,7 @@ void get_simplified_should_return_latest_state_in_external_variable(){
 
     @Test
     @SuppressWarnings("deprecation")
-    void get_latest_should_return_usualSurveyId_when_idue(){
-        //GIVEN
+    void get_latest_should_return_usualSurveyId_when_idue() {
         SurveyUnitDocument surveyUnitDocument = new SurveyUnitDocument();
         surveyUnitDocument.setMode(String.valueOf(Mode.WEB));
         surveyUnitDocument.setIdUE(TestConstants.DEFAULT_SURVEY_UNIT_ID);
@@ -291,22 +301,18 @@ void get_latest_should_return_usualSurveyId_when_idue(){
         doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(Collections.singletonList(surveyUnitDocument)))
                 .when(surveyUnitPersistencePortStub).findByIds(any(), any());
 
-        //WHEN
         List<SurveyUnitModel> surveyUnitModels = surveyUnitService.findLatestByIdAndByCollectionInstrumentId(
                 TestConstants.DEFAULT_INTERROGATION_ID,
                 TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
         );
 
-        //THEN
-        Assertions.assertThat(surveyUnitModels).isNotNull().hasSize(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getUsualSurveyUnitId()).isEqualTo(TestConstants.DEFAULT_SURVEY_UNIT_ID);
-
+        assertThat(surveyUnitModels).isNotNull().hasSize(1);
+        assertThat(surveyUnitModels.getFirst().getUsualSurveyUnitId()).isEqualTo(TestConstants.DEFAULT_SURVEY_UNIT_ID);
     }
 
     @Test
     @SuppressWarnings("deprecation")
-    void get_latest_should_return_edited(){
-        //GIVEN
+    void get_latest_should_return_edited() {
         List<SurveyUnitDocument> surveyUnitDocuments = new ArrayList<>();
 
         SurveyUnitDocument surveyUnitDocument = new SurveyUnitDocument();
@@ -332,65 +338,544 @@ void get_latest_should_return_edited(){
         surveyUnitDocument.getCollectedVariables().getFirst().setValue("VAR2");
         surveyUnitDocuments.add(surveyUnitDocument);
 
-
         doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(surveyUnitDocuments))
                 .when(surveyUnitPersistencePortStub).findInterrogationIdsByCollectionInstrumentId(any());
         doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(surveyUnitDocuments))
                 .when(surveyUnitPersistencePortStub).findByIds(any(), any());
 
-        //WHEN
         List<SurveyUnitModel> surveyUnitModels = surveyUnitService.findLatestByIdAndByCollectionInstrumentId(
                 TestConstants.DEFAULT_INTERROGATION_ID,
                 TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
         );
 
-        //THEN
-        Assertions.assertThat(surveyUnitModels).isNotNull().hasSize(2);
+        assertThat(surveyUnitModels).isNotNull().hasSize(2);
     }
 
     @Test
     void countResponsesByCollectionInstrumentId_test() {
-        //GIVEN
         long exampleCount = 200;
         doReturn(exampleCount).when(surveyUnitPersistencePortStub).countByCollectionInstrumentId(any());
 
-        //WHEN + THEN
-        Assertions.assertThat(surveyUnitService.countResponsesByCollectionInstrumentId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID))
+        assertThat(surveyUnitService.countResponsesByCollectionInstrumentId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID))
                 .isEqualTo(exampleCount);
     }
 
     @Test
-    void findByIdsUsualSurveyUnitAndCollectionInstrument_should_return_survey_units_from_persistence_port() {
-        //GIVEN
-        List<SurveyUnitDocument> surveyUnitDocuments = new ArrayList<>();
+    @DisplayName("saveSurveyUnits should call persistance port")
+    void saveSurveyUnits_shouldDelegateToPersistencePort() {
+        // GIVEN
+        List<SurveyUnitModel> models = List.of(mock(SurveyUnitModel.class));
 
-        SurveyUnitDocument surveyUnitDocument = new SurveyUnitDocument();
-        surveyUnitDocument.setMode(String.valueOf(Mode.WEB));
-        surveyUnitDocument.setUsualSurveyUnitId(TestConstants.DEFAULT_SURVEY_UNIT_ID);
-        surveyUnitDocument.setState(DataState.COLLECTED.toString());
-        surveyUnitDocument.setRecordDate(LocalDateTime.now().minusMinutes(1));
-        surveyUnitDocument.setCollectedVariables(new ArrayList<>());
-        surveyUnitDocument.getCollectedVariables().add(new VariableDocument());
-        surveyUnitDocument.getCollectedVariables().getFirst().setVarId("VAR1");
-        surveyUnitDocument.getCollectedVariables().getFirst().setIteration(1);
-        surveyUnitDocument.getCollectedVariables().getFirst().setValue("VAR1");
-        surveyUnitDocuments.add(surveyUnitDocument);
+        // WHEN
+        surveyUnitService.saveSurveyUnits(models);
 
+        // THEN
+        verify(surveyUnitPersistencePortStub).saveAll(models);
+    }
 
-        doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(surveyUnitDocuments))
-                .when(surveyUnitPersistencePortStub).findByUsualSurveyUnitAndCollectionInstrumentIds(
-                TestConstants.DEFAULT_SURVEY_UNIT_ID,
-                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
+    @Test
+    @DisplayName("findByInterrogationId should call persistance port")
+    void findByInterrogationId_shouldDelegateToPersistencePort() {
+        // GIVEN
+        List<SurveyUnitModel> expected = List.of(mock(SurveyUnitModel.class));
+        doReturn(expected).when(surveyUnitPersistencePortStub).findByInterrogationId(any());
 
-        //WHEN
-        List<SurveyUnitModel> surveyUnitModels = surveyUnitService.findByIdsUsualSurveyUnitAndCollectionInstrument(
-                TestConstants.DEFAULT_SURVEY_UNIT_ID,
-                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
-        );
+        // WHEN
+        List<SurveyUnitModel> result = surveyUnitService.findByInterrogationId(TestConstants.DEFAULT_INTERROGATION_ID);
 
-        //THEN
-        Assertions.assertThat(surveyUnitModels).isNotNull().hasSize(1);
-        Assertions.assertThat(surveyUnitModels.getFirst().getUsualSurveyUnitId()).isEqualTo(TestConstants.DEFAULT_SURVEY_UNIT_ID);
+        // THEN
+        assertThat(result).isEqualTo(expected);
+    }
+
+    @Nested
+    @DisplayName("findDistinctInterrogationIds tests")
+    class FindDistinctInterrogationIdsTests {
+
+        @Test
+        @DisplayName("findDistinctInterrogationIdsByQuestionnaireId should return distinct ids")
+        void findDistinctInterrogationIdsByQuestionnaireId_shouldReturnDistinctIds() {
+            // GIVEN
+            SurveyUnitDocument doc1 = buildDoc("INTERRO1", Mode.WEB);
+            SurveyUnitDocument doc2 = buildDoc("INTERRO1", Mode.WEB); // doublon
+            SurveyUnitDocument doc3 = buildDoc("INTERRO2", Mode.WEB);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(doc1, doc2, doc3)))
+                    .when(surveyUnitPersistencePortStub).findInterrogationIdsByCollectionInstrumentId(any());
+
+            // WHEN
+            List<InterrogationId> result = surveyUnitService.findDistinctInterrogationIdsByQuestionnaireId(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+            );
+
+            // THEN
+            assertThat(result).hasSize(2)
+                    .extracting(InterrogationId::getInterrogationId)
+                    .containsExactlyInAnyOrder("INTERRO1", "INTERRO2");
+        }
+
+        @Test
+        @DisplayName("findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter should return distinct ids after date")
+        void findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter_shouldReturnDistinctIds() {
+            // GIVEN
+            LocalDateTime since = LocalDateTime.now().minusDays(1);
+            SurveyUnitDocument doc1 = buildDoc("INTERRO1", Mode.WEB);
+            SurveyUnitDocument doc2 = buildDoc("INTERRO1", Mode.WEB); // doublon
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(doc1, doc2)))
+                    .when(surveyUnitPersistencePortStub).findInterrogationIdsByQuestionnaireIdAndDateAfter(any(), any());
+
+            // WHEN
+            List<InterrogationId> result = surveyUnitService.findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, since
+            );
+
+            // THEN
+            assertThat(result).hasSize(1)
+                    .extracting(InterrogationId::getInterrogationId)
+                    .containsExactly("INTERRO1");
+        }
+
+        @Test
+        @DisplayName("findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween should return distinct" +
+                " ids between dates")
+        void findDistinctByCollectionInstrumentIdAndRecordDateBetween_shouldReturnDistinctIds() {
+            // GIVEN
+            LocalDateTime start = LocalDateTime.now().minusDays(7);
+            LocalDateTime end = LocalDateTime.now();
+            SurveyUnitDocument doc = buildDoc("INTERRO1", Mode.WEB);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(doc)))
+                    .when(surveyUnitPersistencePortStub).findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(any(), any(), any());
+
+            // WHEN
+            List<InterrogationId> result = surveyUnitService.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, start, end
+            );
+
+            // THEN
+            assertThat(result).hasSize(1)
+                    .extracting(InterrogationId::getInterrogationId)
+                    .containsExactly("INTERRO1");
+        }
+    }
+
+    @Nested
+    @DisplayName("findModes tests")
+    class FindModesTests {
+
+        @Test
+        @DisplayName("findModesByCollectionInstrumentId should return distinct modes")
+        void findModesByCollectionInstrumentId_shouldReturnDistinctModes() {
+            // GIVEN
+            SurveyUnitDocument webDoc = buildDoc("INTERRO1", Mode.WEB);
+            SurveyUnitDocument f2fDoc = buildDoc("INTERRO2", Mode.F2F);
+            SurveyUnitDocument webDoc2 = buildDoc("INTERRO3", Mode.WEB);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(webDoc, f2fDoc, webDoc2)))
+                    .when(surveyUnitPersistencePortStub).findInterrogationIdsByCollectionInstrumentId(any());
+
+            // WHEN
+            List<Mode> result = surveyUnitService.findModesByCollectionInstrumentId(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+            );
+
+            // THEN
+            assertThat(result).hasSize(2).containsExactlyInAnyOrder(Mode.WEB, Mode.F2F);
+        }
+
+        @Test
+        @DisplayName("findModesByCollectionInstrumentId should throw QuestionnaireNotFoundException if not found")
+        void findModesByCollectionInstrumentId_shouldThrow_whenEmpty() {
+            // GIVEN
+            doReturn(Collections.emptyList())
+                    .when(surveyUnitPersistencePortStub).findInterrogationIdsByCollectionInstrumentId(any());
+
+            // WHEN + THEN
+            assertThatThrownBy(() -> surveyUnitService.findModesByCollectionInstrumentId(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+            )).isInstanceOf(QuestionnaireNotFoundException.class);
+        }
+
+        @Test
+        @DisplayName("findModesByCampaignId should return distinct modes")
+        void findModesByCampaignId_shouldReturnDistinctModes() {
+            // GIVEN
+            SurveyUnitDocument webDoc = buildDoc("INTERRO1", Mode.WEB);
+            SurveyUnitDocument f2fDoc = buildDoc("INTERRO2", Mode.F2F);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(webDoc, f2fDoc)))
+                    .when(surveyUnitPersistencePortStub).findInterrogationIdsByCampaignId(any());
+
+            // WHEN
+            List<Mode> result = surveyUnitService.findModesByCampaignId("CAMPAIGN1");
+
+            // THEN
+            assertThat(result).containsExactlyInAnyOrder(Mode.WEB, Mode.F2F);
+        }
+
+        @Test
+        @DisplayName("findModesByQuestionnaireIdV2 should return distinct modes")
+        void findModesByQuestionnaireIdV2_shouldReturnDistinctModes() {
+            // GIVEN
+            SurveyUnitDocument webDoc = buildDoc("INTERRO1", Mode.WEB);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(webDoc)))
+                    .when(surveyUnitPersistencePortStub).findModesByQuestionnaireIdV2(any());
+
+            // WHEN
+            List<Mode> result = surveyUnitService.findModesByQuestionnaireIdV2(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID
+            );
+
+            // THEN
+            assertThat(result).containsExactly(Mode.WEB);
+        }
+
+        @Test
+        @DisplayName("findModesByCampaignIdV2 should return distinct modes")
+        void findModesByCampaignIdV2_shouldReturnDistinctModes() {
+            // GIVEN
+            SurveyUnitDocument f2fDoc = buildDoc("INTERRO1", Mode.F2F);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(f2fDoc)))
+                    .when(surveyUnitPersistencePortStub).findModesByCampaignIdV2(any());
+
+            // WHEN
+            List<Mode> result = surveyUnitService.findModesByCampaignIdV2("CAMPAIGN1");
+
+            // THEN
+            assertThat(result).containsExactly(Mode.F2F);
+        }
+    }
+
+    @Test
+    @DisplayName("deleteByCollectionInstrumentId should return deleted documents count")
+    void deleteByCollectionInstrumentId_shouldReturnDeleteCount() {
+        // GIVEN
+        doReturn(42L).when(surveyUnitPersistencePortStub).deleteByCollectionInstrumentId(any());
+
+        // WHEN
+        Long result = surveyUnitService.deleteByCollectionInstrumentId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+
+        // THEN
+        assertThat(result).isEqualTo(42L);
+    }
+
+    @Test
+    @DisplayName("countResponses should call persistance port")
+    void countResponses_shouldDelegateToPersistencePort() {
+        // GIVEN
+        doReturn(500L).when(surveyUnitPersistencePortStub).count();
+
+        // WHEN + THEN
+        assertThat(surveyUnitService.countResponses()).isEqualTo(500L);
+    }
+
+    @Test
+    @DisplayName("countResponsesByCampaignId should call persistance port")
+    void countResponsesByCampaignId_shouldDelegateToPersistencePort() {
+        // GIVEN
+        doReturn(123L).when(surveyUnitPersistencePortStub).countByCampaignId(any());
+
+        // WHEN + THEN
+        assertThat(surveyUnitService.countResponsesByCampaignId("CAMPAIGN1")).isEqualTo(123L);
+    }
+
+    @Test
+    @DisplayName("countResponsesByQuestionnaireId should call persistance port")
+    void countResponsesByQuestionnaireId_shouldDelegateToPersistencePort() {
+        // GIVEN
+        doReturn(77L).when(surveyUnitPersistencePortStub).countByQuestionnaireId(any());
+
+        // WHEN + THEN
+        assertThat(surveyUnitService.countResponsesByQuestionnaireId(
+                TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID)
+        ).isEqualTo(77L);
+    }
+
+    @Nested
+    @DisplayName("findQuestionnaireIdByInterrogationId tests")
+    class FindQuestionnaireIdByInterrogationIdTests {
+
+        @Test
+        @DisplayName("Should return questionnaireId if unique")
+        void findQuestionnaireIdByInterrogationId_shouldReturnQuestionnaireId() throws GenesisException {
+            // GIVEN
+            SurveyUnitDocument doc = buildDoc(TestConstants.DEFAULT_INTERROGATION_ID, Mode.WEB);
+            doc.setQuestionnaireId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(doc)))
+                    .when(surveyUnitPersistencePortStub).findByInterrogationId(any());
+
+            // WHEN
+            String result = surveyUnitService.findQuestionnaireIdByInterrogationId(
+                    TestConstants.DEFAULT_INTERROGATION_ID
+            );
+
+            // THEN
+            assertThat(result).isEqualTo(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+        }
+
+        @Test
+        @DisplayName("Should throw GenesisException 404 if no response found")
+        void findQuestionnaireIdByInterrogationId_shouldThrow404_whenEmpty() {
+            // GIVEN
+            doReturn(Collections.emptyList())
+                    .when(surveyUnitPersistencePortStub).findByInterrogationId(any());
+
+            // WHEN + THEN
+            assertThatThrownBy(() -> surveyUnitService.findQuestionnaireIdByInterrogationId(
+                    TestConstants.DEFAULT_INTERROGATION_ID
+            ))
+                    .isInstanceOf(GenesisException.class)
+                    .hasMessageContaining(TestConstants.DEFAULT_INTERROGATION_ID);
+        }
+
+        @Test
+        @DisplayName("Should throw GenesisException 207 if multiple questionnaires found")
+        void findQuestionnaireIdByInterrogationId_shouldThrow207_whenMultipleQuestionnaires() {
+            // GIVEN
+            SurveyUnitDocument doc1 = buildDoc(TestConstants.DEFAULT_INTERROGATION_ID, Mode.WEB);
+            doc1.setQuestionnaireId("QUEST1");
+            SurveyUnitDocument doc2 = buildDoc(TestConstants.DEFAULT_INTERROGATION_ID, Mode.WEB);
+            doc2.setQuestionnaireId("QUEST2");
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(doc1, doc2)))
+                    .when(surveyUnitPersistencePortStub).findByInterrogationId(any());
+
+            // WHEN + THEN
+            assertThatThrownBy(() -> surveyUnitService.findQuestionnaireIdByInterrogationId(
+                    TestConstants.DEFAULT_INTERROGATION_ID
+            )).isInstanceOf(GenesisException.class);
+        }
+    }
+
+    @Test
+    @DisplayName("findCampaignsWithQuestionnaires should group questionnaires with their campaign")
+    void findCampaignsWithQuestionnaires_shouldGroupQuestionnairesPerCampaign() {
+        // GIVEN
+        doReturn(Set.of("CAMPAIGN1", "CAMPAIGN2"))
+                .when(surveyUnitPersistencePortStub).findDistinctCampaignIds();
+        doReturn(Set.of("QUEST1", "QUEST2"))
+                .when(surveyUnitPersistencePortStub).findQuestionnaireIdsByCampaignId("CAMPAIGN1");
+        doReturn(Set.of("QUEST3"))
+                .when(surveyUnitPersistencePortStub).findQuestionnaireIdsByCampaignId("CAMPAIGN2");
+
+        // WHEN
+        List<CampaignWithQuestionnaire> result = surveyUnitService.findCampaignsWithQuestionnaires();
+
+        // THEN
+        assertThat(result).hasSize(2);
+        CampaignWithQuestionnaire campaign1Result = result.stream()
+                .filter(c -> c.getCampaignId().equals("CAMPAIGN1")).findFirst().orElseThrow();
+        assertThat(campaign1Result.getQuestionnaires()).containsExactlyInAnyOrder("QUEST1", "QUEST2");
+    }
+
+    @Test
+    @DisplayName("findQuestionnairesWithCampaigns should group campaigns with their questionnaire")
+    void findQuestionnairesWithCampaigns_shouldGroupCampaignsPerQuestionnaire() {
+        // GIVEN
+        doReturn(Set.of("QUEST1"))
+                .when(surveyUnitPersistencePortStub).findDistinctQuestionnairesAndCollectionInstrumentIds();
+        doReturn(Set.of("CAMPAIGN1", "CAMPAIGN2"))
+                .when(surveyUnitPersistencePortStub).findCampaignIdsByQuestionnaireId("QUEST1");
+
+        // WHEN
+        List<QuestionnaireWithCampaign> result = surveyUnitService.findQuestionnairesWithCampaigns();
+
+        // THEN
+        assertThat(result).hasSize(1);
+        assertThat(result.getFirst().getCampaigns()).containsExactlyInAnyOrder("CAMPAIGN1", "CAMPAIGN2");
+    }
+
+    @Nested
+    @DisplayName("findDistinctPageableInterrogationIdsByQuestionnaireId tests")
+    class FindDistinctPageableInterrogationIdsTests {
+
+        @Test
+        @DisplayName("Should return empty list if out of bounds page")
+        void findDistinctPageable_shouldReturnEmpty_whenPageOutOfBounds() {
+            // GIVEN
+            doReturn(10L).when(surveyUnitPersistencePortStub).countByCollectionInstrumentId(any());
+
+            // WHEN - page 5 avec blockSize 3 => skip=15 > totalSize=10
+            List<InterrogationId> result = surveyUnitService.findDistinctPageableInterrogationIdsByQuestionnaireId(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, 0, 3, 5
+            );
+
+            // THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should return empty list if negative page")
+        void findDistinctPageable_shouldReturnEmpty_whenNegativePage() {
+            // WHEN
+            List<InterrogationId> result = surveyUnitService.findDistinctPageableInterrogationIdsByQuestionnaireId(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, 10, 3, -1
+            );
+
+            // THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should use provided totalSize")
+        void findDistinctPageable_shouldUseTotalSizeParam_whenProvided() {
+            // GIVEN
+            SurveyUnitDocument doc = buildDoc("INTERRO1", Mode.WEB);
+            doReturn(SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(List.of(doc)))
+                    .when(surveyUnitPersistencePortStub).findPageableInterrogationIdsByQuestionnaireId(any(), any(), any());
+
+            // WHEN
+            List<InterrogationId> result = surveyUnitService.findDistinctPageableInterrogationIdsByQuestionnaireId(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, 100, 10, 0
+            );
+
+            // THEN
+            verify(surveyUnitPersistencePortStub, never()).countByCollectionInstrumentId(any());
+            assertThat(result).hasSize(1);
+        }
+    }
+
+    @Nested
+    @DisplayName("parseEditedVariables tests")
+    class ParseEditedVariablesTests {
+
+        @Test
+        @DisplayName("Should throw GenesisException if COLLECTED state")
+        void parseEditedVariables_shouldThrow_whenCollectedStateReceived() {
+            // GIVEN
+            VariableStateInputDto variableStateInputDto = VariableStateInputDto.builder()
+                    .state(DataState.COLLECTED)
+                    .value("someValue")
+                    .build();
+
+            VariableInputDto variableInputDto = VariableInputDto.builder()
+                    .variableName("VAR1")
+                    .variableStateInputDto(variableStateInputDto)
+                    .iteration(1)
+                    .build();
+
+            SurveyUnitInputDto inputDto = SurveyUnitInputDto.builder()
+                    .interrogationId(TestConstants.DEFAULT_INTERROGATION_ID)
+                    .questionnaireId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID)
+                    .mode(Mode.WEB)
+                    .collectedVariables(List.of(variableInputDto))
+                    .build();
+
+            // WHEN + THEN
+            assertThatThrownBy(() -> surveyUnitService.parseEditedVariables(
+                    inputDto, "user1", new VariablesMap()
+            )).isInstanceOf(GenesisException.class)
+                    .hasMessageContaining("COLLECTED");
+        }
+
+        @Test
+        @DisplayName("Should create one SurveyUnitModel for each state")
+        void parseEditedVariables_shouldCreateOneModelPerDistinctState() throws GenesisException {
+            // GIVEN
+            VariablesMap variablesMap = buildVariablesMapWithVar();
+            SurveyUnitInputDto inputDto = buildInputDtoWithStates(
+                    List.of(DataState.EDITED, DataState.FORCED)
+            );
+
+            // WHEN
+            List<SurveyUnitModel> result = surveyUnitService.parseEditedVariables(inputDto, "user1", variablesMap);
+
+            // THEN
+            assertThat(result).hasSize(2);
+            assertThat(result)
+                    .extracting(SurveyUnitModel::getState)
+                    .containsExactlyInAnyOrder(DataState.EDITED, DataState.FORCED);
+        }
+
+        @Test
+        @DisplayName("modifiedBy should be filled")
+        void parseEditedVariables_shouldSetModifiedBy() throws GenesisException {
+            // GIVEN
+            VariablesMap variablesMap = buildVariablesMapWithVar();
+            SurveyUnitInputDto inputDto = buildInputDtoWithStates(
+                    List.of(DataState.EDITED)
+            );
+
+            // WHEN
+            List<SurveyUnitModel> result = surveyUnitService.parseEditedVariables(inputDto, "userX", variablesMap);
+
+            // THEN
+            assertThat(result.getFirst().getModifiedBy()).isEqualTo("userX");
+        }
+
+        @Test
+        @DisplayName("Should handle null value")
+        void parseEditedVariables_shouldHandleNullValue() throws GenesisException {
+            // GIVEN
+            VariablesMap variablesMap = buildVariablesMapWithVar();
+            VariableStateInputDto variableStateInputDto = VariableStateInputDto.builder()
+                    .state(DataState.EDITED)
+                    .build();
+
+            VariableInputDto variableInputDto = VariableInputDto.builder()
+                    .variableName("VAR1")
+                    .variableStateInputDto(variableStateInputDto)
+                    .iteration(1)
+                    .build();
+
+            SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
+                    .interrogationId(TestConstants.DEFAULT_INTERROGATION_ID)
+                    .questionnaireId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID)
+                    .mode(Mode.WEB)
+                    .collectedVariables(List.of(variableInputDto))
+                    .build();
+
+            // WHEN
+            List<SurveyUnitModel> result = surveyUnitService.parseEditedVariables(surveyUnitInputDto, "user1", variablesMap);
+
+            // THEN
+            assertThat(result).hasSize(1);
+            VariableModel variable = result.getFirst().getCollectedVariables().getFirst();
+            assertThat(variable.value()).isNull();
+        }
+
+        // parseEditedVariable UTILS
+        private SurveyUnitInputDto buildInputDtoWithStates(List<DataState> states) {
+            List<VariableInputDto> variables = new ArrayList<>();
+            for (DataState state : states) {
+                VariableStateInputDto variableStateInputDto = VariableStateInputDto.builder()
+                        .state(state)
+                        .value("value_" + state)
+                        .build();
+
+                VariableInputDto variableInputDto = VariableInputDto.builder()
+                        .variableName("VAR1")
+                        .variableStateInputDto(variableStateInputDto)
+                        .iteration(1)
+                        .build();
+                variables.add(variableInputDto);
+            }
+
+            return SurveyUnitInputDto.builder()
+                    .interrogationId(TestConstants.DEFAULT_INTERROGATION_ID)
+                    .questionnaireId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID)
+                    .mode(Mode.WEB)
+                    .collectedVariables(variables)
+                    .build();
+        }
+
+        private VariablesMap buildVariablesMapWithVar() {
+            MetadataModel metadataModel = new MetadataModel();
+            Variable variable = new Variable(
+                    "VAR1",
+                    metadataModel.getRootGroup(),
+                    VariableType.STRING,
+                    "1"
+            );
+            metadataModel.getVariables().putVariable(variable);
+            return metadataModel.getVariables();
+        }
+    }
+
+    //UTILS
+
+    private SurveyUnitDocument buildDoc(String interrogationId, Mode mode) {
+        SurveyUnitDocument doc = new SurveyUnitDocument();
+        doc.setInterrogationId(interrogationId);
+        doc.setMode(String.valueOf(mode));
+        doc.setQuestionnaireId(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+        doc.setCollectedVariables(new ArrayList<>());
+        doc.setExternalVariables(new ArrayList<>());
+        doc.setRecordDate(LocalDateTime.now());
+        return doc;
     }
 }
diff --git a/src/test/java/fr/insee/genesis/domain/service/volumetry/VolumetryLogServiceUnitTest.java b/src/test/java/fr/insee/genesis/domain/service/volumetry/VolumetryLogServiceUnitTest.java
index ab2d31d4..1cb89a6f 100644
--- a/src/test/java/fr/insee/genesis/domain/service/volumetry/VolumetryLogServiceUnitTest.java
+++ b/src/test/java/fr/insee/genesis/domain/service/volumetry/VolumetryLogServiceUnitTest.java
@@ -6,11 +6,11 @@
 import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
 import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
-import fr.insee.genesis.stubs.ConfigStub;
 import lombok.SneakyThrows;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -27,22 +27,21 @@
 import java.util.stream.Stream;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
 class VolumetryLogServiceUnitTest {
 
     private static VolumetryLogService volumetryLogService;
-    private static final Config config = new ConfigStub();
+    private static final Config config = TestConstants.getConfigStub();
     private static final Path logFilePath = Path.of(config.getLogFolder()).resolve(Constants.VOLUMETRY_FOLDER_NAME);
 
     @BeforeEach
     @SneakyThrows
     void setUp() {
-        volumetryLogService = new VolumetryLogService(
-                config
-        );
-        if(Files.notExists(logFilePath)){
+        volumetryLogService = new VolumetryLogService(config);
+        if (Files.notExists(logFilePath)) {
             Files.createDirectories(logFilePath);
         }
     }
@@ -50,17 +49,14 @@ void setUp() {
     @Test
     @SneakyThrows
     void writeVolumetries_test() {
-        //GIVEN
         SurveyUnitApiPort surveyUnitApiPort = mock(SurveyUnitApiPort.class);
         long exampleResponseCount = 5;
         doReturn(Set.of(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID))
                 .when(surveyUnitApiPort).findDistinctQuestionnairesAndCollectionInstrumentIds();
         doReturn(exampleResponseCount).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(any());
 
-        //WHEN
         Map<String, Long> responseVolumetricsMap = volumetryLogService.writeVolumetries(surveyUnitApiPort);
 
-        //THEN
         Assertions.assertThat(Files.list(logFilePath)).hasSize(1);
         Assertions.assertThat(responseVolumetricsMap)
                 .containsOnlyKeys(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
@@ -71,7 +67,6 @@ void writeVolumetries_test() {
     @Test
     @SneakyThrows
     void writeVolumetries_questionnaireId_test() {
-        //GIVEN
         SurveyUnitApiPort surveyUnitApiPort = mock(SurveyUnitApiPort.class);
         long exampleResponseCount = 5;
         long exampleResponseWithQuestionnaireIdCount = 3;
@@ -80,10 +75,8 @@ void writeVolumetries_questionnaireId_test() {
         doReturn(exampleResponseCount).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(any());
         doReturn(exampleResponseWithQuestionnaireIdCount).when(surveyUnitApiPort).countResponsesByQuestionnaireId(any());
 
-        //WHEN
         Map<String, Long> responseVolumetricsMap = volumetryLogService.writeVolumetries(surveyUnitApiPort);
 
-        //THEN
         Assertions.assertThat(Files.list(logFilePath)).hasSize(1);
         Assertions.assertThat(responseVolumetricsMap)
                 .containsOnlyKeys(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
@@ -95,7 +88,6 @@ void writeVolumetries_questionnaireId_test() {
     @CsvSource({"false, true", "true, false", "true, true", "false, false"})
     @SneakyThrows
     void writeRawDataVolumetries_test(boolean hasOldRawData, boolean hasRawResponses) {
-        //GIVEN
         LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = mock(LunaticJsonRawDataApiPort.class);
         doReturn(hasOldRawData ? Set.of(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID) : Set.of())
                 .when(lunaticJsonRawDataApiPort).findDistinctQuestionnaireIds();
@@ -108,12 +100,10 @@ void writeRawDataVolumetries_test(boolean hasOldRawData, boolean hasRawResponses
         long rawResponseCount = hasRawResponses ? 3 : 0;
         doReturn(rawResponseCount).when(rawResponseApiPort).countByCollectionInstrumentId(any());
 
-        //WHEN
         Map<String, Map<String, Long>> responseVolumetricsMap = volumetryLogService.writeRawDataVolumetries(
                 lunaticJsonRawDataApiPort, rawResponseApiPort
         );
 
-        //THEN
         Assertions.assertThat(Files.list(logFilePath)).hasSize(1);
         Assertions.assertThat(responseVolumetricsMap)
                 .containsOnlyKeys(
@@ -123,30 +113,24 @@ void writeRawDataVolumetries_test(boolean hasOldRawData, boolean hasRawResponses
                 );
 
         if (hasOldRawData) {
-            Assertions.assertThat(
-                    responseVolumetricsMap.get(Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME)
-            ).containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, oldRawDataCount);
+            Assertions.assertThat(responseVolumetricsMap.get(Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME))
+                    .containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, oldRawDataCount);
         }
         if (hasRawResponses) {
-            Assertions.assertThat(
-                    responseVolumetricsMap.get(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME)
-            ).containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, rawResponseCount);
+            Assertions.assertThat(responseVolumetricsMap.get(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME))
+                    .containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, rawResponseCount);
         }
 
-        if(hasOldRawData || hasRawResponses) {
-            Assertions.assertThat(
-                    responseVolumetricsMap.get(Constants.VOLUMETRY_RAW_TOTAL)
-            ).containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, oldRawDataCount + rawResponseCount);
+        if (hasOldRawData || hasRawResponses) {
+            Assertions.assertThat(responseVolumetricsMap.get(Constants.VOLUMETRY_RAW_TOTAL))
+                    .containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, oldRawDataCount + rawResponseCount);
         } else {
-            Assertions.assertThat(
-                    responseVolumetricsMap.get(Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME)
-            ).doesNotContainKey(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
-            Assertions.assertThat(
-                    responseVolumetricsMap.get(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME)
-            ).doesNotContainKey(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
-            Assertions.assertThat(
-                    responseVolumetricsMap.get(Constants.VOLUMETRY_RAW_TOTAL)
-            ).doesNotContainKey(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+            Assertions.assertThat(responseVolumetricsMap.get(Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME))
+                    .doesNotContainKey(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+            Assertions.assertThat(responseVolumetricsMap.get(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME))
+                    .doesNotContainKey(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
+            Assertions.assertThat(responseVolumetricsMap.get(Constants.VOLUMETRY_RAW_TOTAL))
+                    .doesNotContainKey(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID);
         }
     }
 
@@ -154,28 +138,21 @@ void writeRawDataVolumetries_test(boolean hasOldRawData, boolean hasRawResponses
     @ValueSource(booleans = {false, true})
     @SneakyThrows
     void cleanOldFiles(boolean isRawVolumetricFile) {
-        //GIVEN
         String volumetricFileSuffix = isRawVolumetricFile ? Constants.VOLUMETRY_RAW_FILE_SUFFIX : Constants.VOLUMETRY_FILE_SUFFIX;
-        //Recent file to not delete
         LocalDateTime recentDateTime = LocalDateTime.now();
         Files.createFile(logFilePath.resolve(
                 recentDateTime.format(DateTimeFormatter.ofPattern(Constants.VOLUMETRY_FILE_DATE_FORMAT))
-                        + volumetricFileSuffix
-                        + ".csv"
+                        + volumetricFileSuffix + ".csv"
         ));
-        //Old file to delete
         LocalDateTime oldDateTime = LocalDateTime.now().minusYears(5);
         Files.createFile(logFilePath.resolve(
                 oldDateTime.format(DateTimeFormatter.ofPattern(Constants.VOLUMETRY_FILE_DATE_FORMAT))
-                        + volumetricFileSuffix
-                        + ".csv"
+                        + volumetricFileSuffix + ".csv"
         ));
 
-        //WHEN
         volumetryLogService.cleanOldFiles();
 
-        //THEN
-        try(Stream<Path> pathStream = Files.list(logFilePath)) {
+        try (Stream<Path> pathStream = Files.list(logFilePath)) {
             List<Path> pathList = pathStream.toList();
             Assertions.assertThat(pathList).hasSize(1);
             Assertions.assertThat(pathList.getFirst().getFileName().toString())
@@ -183,6 +160,264 @@ void cleanOldFiles(boolean isRawVolumetricFile) {
         }
     }
 
+    @Test
+    @SneakyThrows
+    @DisplayName("writeVolumetries should erase existing file")
+    void writeVolumetries_shouldOverwriteExistingFile() {
+        // GIVEN
+        SurveyUnitApiPort surveyUnitApiPort = mock(SurveyUnitApiPort.class);
+        doReturn(Set.of(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID))
+                .when(surveyUnitApiPort).findDistinctQuestionnairesAndCollectionInstrumentIds();
+        doReturn(5L).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(any());
+        volumetryLogService.writeVolumetries(surveyUnitApiPort);
+
+        // WHEN
+        doReturn(10L).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(any());
+        Map<String, Long> result = volumetryLogService.writeVolumetries(surveyUnitApiPort);
+
+        // THEN
+        Assertions.assertThat(Files.list(logFilePath)).hasSize(1);
+        Assertions.assertThat(result).containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, 10L);
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeVolumetries should return empty map when no questionnaire")
+    void writeVolumetries_shouldReturnEmptyMap_whenNoQuestionnaire() {
+        // GIVEN
+        SurveyUnitApiPort surveyUnitApiPort = mock(SurveyUnitApiPort.class);
+        doReturn(Set.of()).when(surveyUnitApiPort).findDistinctQuestionnairesAndCollectionInstrumentIds();
+
+        // WHEN
+        Map<String, Long> result = volumetryLogService.writeVolumetries(surveyUnitApiPort);
+
+        // THEN
+        Assertions.assertThat(result).isEmpty();
+        try (Stream<Path> pathStream = Files.list(logFilePath)) {
+            List<Path> paths = pathStream.toList();
+            Assertions.assertThat(paths).hasSize(1);
+            String content = Files.readString(paths.getFirst());
+            Assertions.assertThat(content).isEqualTo("campaign;volumetry;distinctInterrogationIds\n");
+        }
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeVolumetries should manage multiple questionnaires")
+    void writeVolumetries_shouldHandleMultipleQuestionnaires() {
+        // GIVEN
+        SurveyUnitApiPort surveyUnitApiPort = mock(SurveyUnitApiPort.class);
+        String questId1 = "QUEST1";
+        String questId2 = "QUEST2";
+        doReturn(Set.of(questId1, questId2))
+                .when(surveyUnitApiPort).findDistinctQuestionnairesAndCollectionInstrumentIds();
+        doReturn(5L).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(questId1);
+        doReturn(3L).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(questId2);
+        doReturn(0L).when(surveyUnitApiPort).countResponsesByQuestionnaireId(any());
+
+        // WHEN
+        Map<String, Long> result = volumetryLogService.writeVolumetries(surveyUnitApiPort);
+
+        // THEN
+        Assertions.assertThat(result).containsOnlyKeys(questId1, questId2)
+                .containsEntry(questId1, 5L).containsEntry(questId2, 3L);
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeVolumetries should create directory")
+    void writeVolumetries_shouldCreateDirectories_whenNotExists() {
+        // GIVEN
+        FileSystemUtils.deleteRecursively(logFilePath);
+        SurveyUnitApiPort surveyUnitApiPort = mock(SurveyUnitApiPort.class);
+        doReturn(Set.of()).when(surveyUnitApiPort).findDistinctQuestionnairesAndCollectionInstrumentIds();
+
+        // WHEN
+        volumetryLogService.writeVolumetries(surveyUnitApiPort);
+
+        // THEN
+        Assertions.assertThat(Files.exists(logFilePath)).isTrue();
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeVolumetries write correct CSV")
+    void writeVolumetries_shouldWriteCorrectCsvContent() {
+        // GIVEN
+        SurveyUnitApiPort surveyUnitApiPort = mock(SurveyUnitApiPort.class);
+        doReturn(Set.of(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID))
+                .when(surveyUnitApiPort).findDistinctQuestionnairesAndCollectionInstrumentIds();
+        doReturn(7L).when(surveyUnitApiPort).countResponsesByCollectionInstrumentId(any());
+        doReturn(0L).when(surveyUnitApiPort).countResponsesByQuestionnaireId(any());
+        doReturn(1L)
+                .when(surveyUnitApiPort).countDistinctInterrogationIdsByQuestionnaireAndCollectionInstrumentId(anyString());
+
+        // WHEN
+        volumetryLogService.writeVolumetries(surveyUnitApiPort);
+
+        // THEN
+        try (Stream<Path> pathStream = Files.list(logFilePath)) {
+            String content = Files.readString(pathStream.toList().getFirst());
+            Assertions.assertThat(content).startsWith("campaign;volumetry;distinctInterrogationIds\n");
+            Assertions.assertThat(content).contains(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID + ";7;1");
+        }
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeRawDataVolumetries should create directories")
+    void writeRawDataVolumetries_shouldCreateDirectories_whenNotExists() {
+        // GIVEN
+        FileSystemUtils.deleteRecursively(logFilePath);
+        LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = mock(LunaticJsonRawDataApiPort.class);
+        doReturn(Set.of()).when(lunaticJsonRawDataApiPort).findDistinctQuestionnaireIds();
+        RawResponseApiPort rawResponseApiPort = mock(RawResponseApiPort.class);
+        doReturn(Set.of()).when(rawResponseApiPort).getDistinctCollectionInstrumentIds();
+
+        // WHEN
+        volumetryLogService.writeRawDataVolumetries(lunaticJsonRawDataApiPort, rawResponseApiPort);
+
+        // THEN
+        Assertions.assertThat(Files.exists(logFilePath)).isTrue();
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeRawDataVolumetries should overwrite existing file")
+    void writeRawDataVolumetries_shouldOverwriteExistingFile() {
+        // GIVEN - premier appel
+        LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = mock(LunaticJsonRawDataApiPort.class);
+        doReturn(Set.of(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID))
+                .when(lunaticJsonRawDataApiPort).findDistinctQuestionnaireIds();
+        doReturn(5L).when(lunaticJsonRawDataApiPort).countRawResponsesByQuestionnaireId(any());
+        RawResponseApiPort rawResponseApiPort = mock(RawResponseApiPort.class);
+        doReturn(Set.of()).when(rawResponseApiPort).getDistinctCollectionInstrumentIds();
+        doReturn(0L).when(rawResponseApiPort).countByCollectionInstrumentId(any());
+        volumetryLogService.writeRawDataVolumetries(lunaticJsonRawDataApiPort, rawResponseApiPort);
+
+        // WHEN - second appel
+        doReturn(9L).when(lunaticJsonRawDataApiPort).countRawResponsesByQuestionnaireId(any());
+        Map<String, Map<String, Long>> result = volumetryLogService.writeRawDataVolumetries(
+                lunaticJsonRawDataApiPort, rawResponseApiPort
+        );
+
+        // THEN
+        Assertions.assertThat(Files.list(logFilePath)).hasSize(1);
+        Assertions.assertThat(
+                result.get(Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME))
+                .containsEntry(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID, 9L);
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeRawDataVolumetries should write correct CSV")
+    void writeRawDataVolumetries_shouldWriteCorrectCsvContent() {
+        // GIVEN
+        LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = mock(LunaticJsonRawDataApiPort.class);
+        doReturn(Set.of(TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID))
+                .when(lunaticJsonRawDataApiPort).findDistinctQuestionnaireIds();
+        doReturn(4L).when(lunaticJsonRawDataApiPort).countRawResponsesByQuestionnaireId(any());
+        RawResponseApiPort rawResponseApiPort = mock(RawResponseApiPort.class);
+        doReturn(Set.of()).when(rawResponseApiPort).getDistinctCollectionInstrumentIds();
+        doReturn(2L).when(rawResponseApiPort).countByCollectionInstrumentId(any());
+
+        // WHEN
+        volumetryLogService.writeRawDataVolumetries(lunaticJsonRawDataApiPort, rawResponseApiPort);
+
+        // THEN
+        try (Stream<Path> pathStream = Files.list(logFilePath)) {
+            String content = Files.readString(pathStream.toList().getFirst());
+            Assertions.assertThat(content).contains(
+                    Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME,
+                    Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME,
+                    Constants.VOLUMETRY_RAW_TOTAL
+            );
+            Assertions.assertThat(content).contains(
+                    TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID + ";4;2;6"
+            );
+        }
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("writeRawDataVolumetries should merge from old models and filiere")
+    void writeRawDataVolumetries_shouldMergeQuestionnairesFromBothSources() {
+        // GIVEN
+        LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = mock(LunaticJsonRawDataApiPort.class);
+        doReturn(Set.of("QUEST1")).when(lunaticJsonRawDataApiPort).findDistinctQuestionnaireIds();
+        doReturn(5L).when(lunaticJsonRawDataApiPort).countRawResponsesByQuestionnaireId("QUEST1");
+        doReturn(0L).when(lunaticJsonRawDataApiPort).countRawResponsesByQuestionnaireId("QUEST2");
+
+        RawResponseApiPort rawResponseApiPort = mock(RawResponseApiPort.class);
+        doReturn(Set.of("QUEST1", "QUEST2")).when(rawResponseApiPort).getDistinctCollectionInstrumentIds();
+        doReturn(3L).when(rawResponseApiPort).countByCollectionInstrumentId(any());
+
+        // WHEN
+        Map<String, Map<String, Long>> result = volumetryLogService.writeRawDataVolumetries(
+                lunaticJsonRawDataApiPort, rawResponseApiPort
+        );
+
+        // THEN
+        Assertions.assertThat(result.get(Constants.VOLUMETRY_RAW_TOTAL))
+                .containsOnlyKeys("QUEST1", "QUEST2");
+        // QUEST1 : 5 (old) + 3 (new) = 8
+        Assertions.assertThat(result.get(Constants.VOLUMETRY_RAW_TOTAL))
+                .containsEntry("QUEST1", 8L);
+        // QUEST2 : 0 (old) + 3 (new) = 3
+        Assertions.assertThat(result.get(Constants.VOLUMETRY_RAW_TOTAL))
+                .containsEntry("QUEST2", 3L);
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("cleanOldFiles should not delete a file with invalid date time")
+    void cleanOldFiles_shouldNotDelete_whenInvalidDateInFilename() {
+        // GIVEN
+        Path invalidDateFile = logFilePath.resolve("not_a_date" + Constants.VOLUMETRY_FILE_SUFFIX + ".csv");
+        Files.createFile(invalidDateFile);
+
+        // WHEN
+        volumetryLogService.cleanOldFiles();
+
+        // THEN
+        Assertions.assertThat(Files.exists(invalidDateFile)).isTrue();
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("cleanOldFiles should work when empty directory")
+    void cleanOldFiles_shouldNotFail_whenDirectoryIsEmpty() {
+        // WHEN + THEN
+        Assertions.assertThatCode(() -> volumetryLogService.cleanOldFiles())
+                .doesNotThrowAnyException();
+    }
+
+    @Test
+    @SneakyThrows
+    @DisplayName("cleanOldFiles should delete all old files")
+    void cleanOldFiles_shouldDeleteAllOldFiles_bothTypes() {
+        // GIVEN - deux anciens fichiers (standard et RAW), un récent
+        LocalDateTime oldDateTime = LocalDateTime.now().minusYears(5);
+        String oldDateStr = oldDateTime.format(DateTimeFormatter.ofPattern(Constants.VOLUMETRY_FILE_DATE_FORMAT));
+
+        Files.createFile(logFilePath.resolve(oldDateStr + Constants.VOLUMETRY_FILE_SUFFIX + ".csv"));
+        Files.createFile(logFilePath.resolve(oldDateStr + Constants.VOLUMETRY_RAW_FILE_SUFFIX + ".csv"));
+
+        LocalDateTime recentDateTime = LocalDateTime.now();
+        String recentDateStr = recentDateTime.format(DateTimeFormatter.ofPattern(Constants.VOLUMETRY_FILE_DATE_FORMAT));
+        Files.createFile(logFilePath.resolve(recentDateStr + Constants.VOLUMETRY_FILE_SUFFIX + ".csv"));
+
+        // WHEN
+        volumetryLogService.cleanOldFiles();
+
+        // THEN
+        try (Stream<Path> pathStream = Files.list(logFilePath)) {
+            List<Path> remaining = pathStream.toList();
+            Assertions.assertThat(remaining).hasSize(1);
+            Assertions.assertThat(remaining.getFirst().getFileName().toString()).contains(recentDateStr);
+        }
+    }
+
     @AfterEach
     @SneakyThrows
     void tearDown() {
diff --git a/src/test/java/fr/insee/genesis/exceptions/NoDataExceptionTest.java b/src/test/java/fr/insee/genesis/exceptions/NoDataExceptionTest.java
new file mode 100644
index 00000000..5afbe3d3
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/exceptions/NoDataExceptionTest.java
@@ -0,0 +1,16 @@
+package fr.insee.genesis.exceptions;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class NoDataExceptionTest {
+    @Test
+    void constructorTest(){
+        //GIVEN
+        String message = "test";
+        NoDataException noDataException = new NoDataException(message);
+
+        //WHEN + THEN
+        Assertions.assertThat(noDataException.getMessage()).isEqualTo(message);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/CacheServiceAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/CacheServiceAdapterTest.java
new file mode 100644
index 00000000..11d8ed09
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/CacheServiceAdapterTest.java
@@ -0,0 +1,41 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+
+import java.util.List;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class CacheServiceAdapterTest {
+
+    @Mock
+    CacheManager cacheManager;
+
+    @InjectMocks
+    CacheServiceAdapter cacheServiceAdapter;
+
+    @Test
+    void evictCaches_test() {
+        //GIVEN
+        Cache mockCache = mock(Cache.class);
+        String mockCacheName = "testCache";
+        doReturn(mockCache).when(cacheManager).getCache(mockCacheName);
+        doReturn(List.of(mockCacheName)).when(cacheManager).getCacheNames();
+
+        //WHEN
+        cacheServiceAdapter.evictCaches();
+
+        //THEN
+        verify(mockCache, times(1)).clear();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/ContextualExternalVariableMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/ContextualExternalVariableMongoAdapterTest.java
new file mode 100644
index 00000000..cd374b2c
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/ContextualExternalVariableMongoAdapterTest.java
@@ -0,0 +1,342 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.domain.model.contextualvariable.ContextualExternalVariableModel;
+import fr.insee.genesis.infrastructure.document.contextualexternal.ContextualExternalVariableDocument;
+import fr.insee.genesis.infrastructure.repository.ContextualExternalVariableMongoDBRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("ContextualExternalVariableMongoAdapter tests")
+class ContextualExternalVariableMongoAdapterTest {
+
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-123";
+    private static final String INTERROGATION_ID = "interrogation-456";
+    private static final String BACKUP_COLLECTION = "editedExternalResponses_instrument-123_backup";
+    private static final String MAIN_COLLECTION = "editedExternalResponses";
+
+    @Mock
+    private MongoTemplate mongoTemplate;
+
+    @Mock
+    private ContextualExternalVariableMongoDBRepository repository;
+
+    @InjectMocks
+    private ContextualExternalVariableMongoAdapter adapter;
+
+    @Nested
+    @DisplayName("backup() tests")
+    class BackupTests {
+
+        @Test
+        @DisplayName("backup() should drop existing backup collection then run aggregation into backup collection")
+        @SuppressWarnings("unchecked")
+        void backup_shouldDeleteThenAggregate() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(true);
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualExternalVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.backup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(mongoTemplate).collectionExists(BACKUP_COLLECTION);
+            verify(mongoTemplate).dropCollection(BACKUP_COLLECTION);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualExternalVariableDocument.class));
+        }
+
+        @Test
+        @DisplayName("backup() should not drop collection if backup does not exist")
+        @SuppressWarnings("unchecked")
+        void backup_shouldSkipDropIfBackupMissing() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(false);
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualExternalVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.backup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(mongoTemplate, never()).dropCollection(BACKUP_COLLECTION);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualExternalVariableDocument.class));
+        }
+    }
+
+    @Nested
+    @DisplayName("deleteBackup() tests")
+    class DeleteBackupTests {
+
+        @Test
+        @DisplayName("deleteBackup() should drop the backup collection when it exists")
+        void deleteBackup_shouldDropCollectionWhenExists() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(true);
+
+            //WHEN
+            adapter.deleteBackup(COLLECTION_INSTRUMENT_ID);
+
+            verify(mongoTemplate).collectionExists(BACKUP_COLLECTION);
+            verify(mongoTemplate).dropCollection(BACKUP_COLLECTION);
+        }
+
+        @Test
+        @DisplayName("deleteBackup() should do nothing when backup collection does not exist")
+        void deleteBackup_shouldDoNothingWhenMissing() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(false);
+
+            //WHEN
+            adapter.deleteBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(mongoTemplate).collectionExists(BACKUP_COLLECTION);
+            verify(mongoTemplate, never()).dropCollection(any(String.class));
+        }
+
+        @Test
+        @DisplayName("deleteBackup() should use correctly formatted collection name")
+        void deleteBackup_shouldUseCorrectCollectionName() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(true);
+
+            //WHEN
+            adapter.deleteBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+            verify(mongoTemplate).dropCollection(captor.capture());
+            assertThat(captor.getValue()).isEqualTo(BACKUP_COLLECTION);
+        }
+    }
+
+    @Nested
+    @DisplayName("restoreBackup() tests")
+    class RestoreBackupTests {
+
+        @Test
+        @DisplayName("restoreBackup() should delete current data then aggregate from backup into main collection")
+        @SuppressWarnings("unchecked")
+        void restoreBackup_shouldDeleteThenAggregate() {
+            //GIVEN
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(BACKUP_COLLECTION), eq(ContextualExternalVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.restoreBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(repository).deleteByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+            verify(repository).deleteByQuestionnaireId(COLLECTION_INSTRUMENT_ID);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), eq(BACKUP_COLLECTION), eq(ContextualExternalVariableDocument.class));
+        }
+
+        @Test
+        @DisplayName("restoreBackup() should aggregate from the correctly named backup collection")
+        @SuppressWarnings("unchecked")
+        void restoreBackup_shouldUseCorrectSourceCollection() {
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(BACKUP_COLLECTION), eq(ContextualExternalVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.restoreBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), captor.capture(), eq(ContextualExternalVariableDocument.class));
+            assertThat(captor.getValue()).isEqualTo(BACKUP_COLLECTION);
+        }
+    }
+
+    @Nested
+    @DisplayName("saveAll() tests")
+    class SaveAllTests {
+
+        @Test
+        @DisplayName("saveAll() should delegate to repository with mapped documents")
+        void saveAll_shouldCallRepositorySaveAll() {
+            //WHEN
+            adapter.saveAll(List.of(buildModel("id-1")));
+
+            //THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<ContextualExternalVariableDocument>> captor = ArgumentCaptor.forClass(List.class);
+            verify(repository).saveAll(captor.capture());
+            assertThat(captor.getValue()).isNotNull();
+        }
+
+        @Test
+        @DisplayName("saveAll() with empty list should call repository with empty list")
+        void saveAll_emptyList_shouldCallRepositoryWithEmptyList() {
+            //WHEN
+            adapter.saveAll(List.of());
+
+            //THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<ContextualExternalVariableDocument>> captor = ArgumentCaptor.forClass(List.class);
+            verify(repository).saveAll(captor.capture());
+            assertThat(captor.getValue()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("saveAll() should pass as many documents as models provided")
+        void saveAll_shouldMapAllModels() {
+            //WHEN
+            adapter.saveAll(List.of(buildModel("id-1"), buildModel("id-2"), buildModel("id-3")));
+
+            //THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<ContextualExternalVariableDocument>> captor = ArgumentCaptor.forClass(List.class);
+            verify(repository).saveAll(captor.capture());
+            assertThat(captor.getValue()).hasSize(3);
+        }
+    }
+
+    @Nested
+    @DisplayName("delete() tests")
+    class DeleteTests {
+
+        @Test
+        @DisplayName("delete() should call both deleteByCollectionInstrumentId and deleteByQuestionnaireId")
+        void delete_shouldCallBothRepositoryDeleteMethods() {
+            //WHEN
+            adapter.delete(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(repository).deleteByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+            verify(repository).deleteByQuestionnaireId(COLLECTION_INSTRUMENT_ID);
+            verifyNoMoreInteractions(repository);
+        }
+
+        @Test
+        @DisplayName("delete() should pass the same id to both delete methods")
+        void delete_shouldPassSameIdToBothMethods() {
+            //WHEN
+            adapter.delete(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);
+            ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);
+            verify(repository).deleteByCollectionInstrumentId(captor1.capture());
+            verify(repository).deleteByQuestionnaireId(captor2.capture());
+
+            assertThat(captor1.getValue()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+            assertThat(captor2.getValue()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+        }
+    }
+
+    @Nested
+    @DisplayName("findByCollectionInstrumentIdAndInterrogationId() tests")
+    class FindTests {
+
+        @Test
+        @DisplayName("Should return null when both repository methods return empty lists")
+        void find_noResults_shouldReturnNull() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            //WHEN
+            ContextualExternalVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            assertThat(result).isNull();
+        }
+
+        @Test
+        @DisplayName("Should return mapped model when exactly one result found via questionnaireId")
+        void find_oneResultViaQuestionnaireId_shouldReturnMappedModel() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of(new ContextualExternalVariableDocument()));
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            //WHEN
+            ContextualExternalVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should return mapped model when exactly one result found via collectionInstrumentId")
+        void find_oneResultViaCollectionInstrumentId_shouldReturnMappedModel() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of(new ContextualExternalVariableDocument()));
+
+            //WHEN
+            ContextualExternalVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should return first result and log warning when more than one document found")
+        void find_moreThanOneResult_shouldReturnFirstAndLogWarn() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of(new ContextualExternalVariableDocument(), new ContextualExternalVariableDocument()));
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            //WHEN
+            ContextualExternalVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should always call both repository find methods")
+        void find_shouldAlwaysCallBothRepositoryMethods() {
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            verify(repository).findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+            verify(repository).findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+        }
+    }
+
+    //UTILS
+    private ContextualExternalVariableModel buildModel(String interrogationId) {
+        return ContextualExternalVariableModel.builder()
+                .interrogationId(interrogationId)
+                .collectionInstrumentId(COLLECTION_INSTRUMENT_ID)
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/ContextualPreviousVariableMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/ContextualPreviousVariableMongoAdapterTest.java
new file mode 100644
index 00000000..b21ea484
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/ContextualPreviousVariableMongoAdapterTest.java
@@ -0,0 +1,360 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.domain.model.contextualvariable.ContextualPreviousVariableModel;
+import fr.insee.genesis.infrastructure.document.contextualprevious.ContextualPreviousVariableDocument;
+import fr.insee.genesis.infrastructure.repository.ContextualPreviousVariableMongoDBRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("ContextualPreviousVariableMongoAdapter tests")
+class ContextualPreviousVariableMongoAdapterTest {
+
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-123";
+    private static final String INTERROGATION_ID = "interrogation-456";
+    private static final String BACKUP_COLLECTION = "editedPreviousResponses_instrument-123_backup";
+    private static final String MAIN_COLLECTION = "editedPreviousResponses";
+
+    @Mock
+    private MongoTemplate mongoTemplate;
+
+    @Mock
+    private ContextualPreviousVariableMongoDBRepository repository;
+
+    @InjectMocks
+    private ContextualPreviousVariableMongoAdapter adapter;
+
+    @Nested
+    @DisplayName("backup() tests")
+    class BackupTests {
+        @Test
+        @DisplayName("backup() should drop existing backup collection then run aggregation into backup collection")
+        @SuppressWarnings("unchecked")
+        void backup_shouldDeleteThenAggregate() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(true);
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualPreviousVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.backup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(mongoTemplate).collectionExists(BACKUP_COLLECTION);
+            verify(mongoTemplate).dropCollection(BACKUP_COLLECTION);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualPreviousVariableDocument.class));
+        }
+
+        @Test
+        @DisplayName("backup() should not drop collection if backup does not exist")
+        @SuppressWarnings("unchecked")
+        void backup_shouldSkipDropIfBackupMissing() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(false);
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualPreviousVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.backup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(mongoTemplate, never()).dropCollection(BACKUP_COLLECTION);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), eq(MAIN_COLLECTION), eq(ContextualPreviousVariableDocument.class));
+        }
+    }
+
+    @Nested
+    @DisplayName("deleteBackup() tests")
+    class DeleteBackupTests {
+
+        @Test
+        @DisplayName("deleteBackup() should drop the backup collection when it exists")
+        void deleteBackup_shouldDropCollectionWhenExists() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(true);
+
+            //WHEN
+            adapter.deleteBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(mongoTemplate).collectionExists(BACKUP_COLLECTION);
+            verify(mongoTemplate).dropCollection(BACKUP_COLLECTION);
+        }
+
+        @Test
+        @DisplayName("deleteBackup() should do nothing when backup collection does not exist")
+        void deleteBackup_shouldDoNothingWhenMissing() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(false);
+
+            //WHEN
+            adapter.deleteBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(mongoTemplate).collectionExists(BACKUP_COLLECTION);
+            verify(mongoTemplate, never()).dropCollection(any(String.class));
+        }
+
+        @Test
+        @DisplayName("deleteBackup() should use correctly formatted collection name")
+        void deleteBackup_shouldUseCorrectCollectionName() {
+            //GIVEN
+            when(mongoTemplate.collectionExists(BACKUP_COLLECTION)).thenReturn(true);
+
+            //WHEN
+            adapter.deleteBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+            verify(mongoTemplate).dropCollection(captor.capture());
+            assertThat(captor.getValue()).isEqualTo(BACKUP_COLLECTION);
+        }
+    }
+
+    @Nested
+    @DisplayName("restoreBackup() tests")
+    class RestoreBackupTests {
+
+        @Test
+        @DisplayName("restoreBackup() should delete current data then aggregate from backup into main collection")
+        @SuppressWarnings("unchecked")
+        void restoreBackup_shouldDeleteThenAggregate() {
+            //GIVEN
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(BACKUP_COLLECTION), eq(ContextualPreviousVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.restoreBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(repository).deleteByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+            verify(repository).deleteByQuestionnaireId(COLLECTION_INSTRUMENT_ID);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), eq(BACKUP_COLLECTION), eq(ContextualPreviousVariableDocument.class));
+        }
+
+        @Test
+        @DisplayName("restoreBackup() should aggregate from the correctly named backup collection")
+        @SuppressWarnings("unchecked")
+        void restoreBackup_shouldUseCorrectSourceCollection() {
+            //GIVEN
+            when(mongoTemplate.aggregate(any(Aggregation.class), eq(BACKUP_COLLECTION), eq(ContextualPreviousVariableDocument.class)))
+                    .thenReturn(mock(AggregationResults.class));
+
+            //WHEN
+            adapter.restoreBackup(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+            verify(mongoTemplate).aggregate(any(Aggregation.class), captor.capture(), eq(ContextualPreviousVariableDocument.class));
+            assertThat(captor.getValue()).isEqualTo(BACKUP_COLLECTION);
+        }
+    }
+
+    @Nested
+    @DisplayName("saveAll() tests")
+    class SaveAllTests {
+
+        @Test
+        @DisplayName("saveAll() should call repository.saveAll() with a non-null list")
+        void saveAll_shouldCallRepositorySaveAll() {
+            //GIVEN
+            adapter.saveAll(List.of(buildModel("id-1")));
+
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<ContextualPreviousVariableDocument>> captor = ArgumentCaptor.forClass(List.class);
+
+
+            //WHEN
+            verify(repository).saveAll(captor.capture());
+
+            //THEN
+            assertThat(captor.getValue()).isNotNull();
+        }
+
+        @Test
+        @DisplayName("saveAll() with empty list should call repository with empty list")
+        void saveAll_emptyList_shouldCallRepositoryWithEmptyList() {
+            //GIVEN
+            adapter.saveAll(List.of());
+
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<ContextualPreviousVariableDocument>> captor = ArgumentCaptor.forClass(List.class);
+
+            //WHEN
+            verify(repository).saveAll(captor.capture());
+
+            //THEN
+            assertThat(captor.getValue()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("saveAll() should pass as many documents as models provided")
+        void saveAll_shouldMapAllModels() {
+            //GIVEN
+            adapter.saveAll(List.of(buildModel("id-1"), buildModel("id-2"), buildModel("id-3")));
+
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<ContextualPreviousVariableDocument>> captor = ArgumentCaptor.forClass(List.class);
+
+            //WHEN
+            verify(repository).saveAll(captor.capture());
+
+            //THEN
+            assertThat(captor.getValue()).hasSize(3);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // delete()
+    // -------------------------------------------------------------------------
+
+    @Nested
+    @DisplayName("delete() tests")
+    class DeleteTests {
+
+        @Test
+        @DisplayName("delete() should call both deleteByCollectionInstrumentId and deleteByQuestionnaireId")
+        void delete_shouldCallBothRepositoryDeleteMethods() {
+            //WHEN
+            adapter.delete(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            verify(repository).deleteByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+            verify(repository).deleteByQuestionnaireId(COLLECTION_INSTRUMENT_ID);
+            verifyNoMoreInteractions(repository);
+        }
+
+        @Test
+        @DisplayName("delete() should pass the same id to both delete methods")
+        void delete_shouldPassSameIdToBothMethods() {
+            //WHEN
+            adapter.delete(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);
+            ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);
+            verify(repository).deleteByCollectionInstrumentId(captor1.capture());
+            verify(repository).deleteByQuestionnaireId(captor2.capture());
+            assertThat(captor1.getValue()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+            assertThat(captor2.getValue()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+        }
+    }
+
+    @Nested
+    @DisplayName("findByCollectionInstrumentIdAndInterrogationId() tests")
+    class FindTests {
+
+        @Test
+        @DisplayName("Should return null when both repository methods return empty lists")
+        void find_noResults_shouldReturnNull() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            //WHEN
+            ContextualPreviousVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNull();
+        }
+
+        @Test
+        @DisplayName("Should return a non-null model when one document is found via questionnaireId")
+        void find_oneResultViaQuestionnaireId_shouldReturnModel() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of(new ContextualPreviousVariableDocument()));
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            //WHEN
+            ContextualPreviousVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should return a non-null model when one document found via collectionInstrumentId")
+        void find_oneResultViaCollectionInstrumentId_shouldReturnModel() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of(new ContextualPreviousVariableDocument()));
+
+            //WHEN
+            ContextualPreviousVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should still return a result when more than one document is found")
+        void find_moreThanOneResult_shouldReturnFirstAndNotNull() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of(new ContextualPreviousVariableDocument(), new ContextualPreviousVariableDocument()));
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            //WHEN
+            ContextualPreviousVariableModel result =
+                    adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should always call both repository find methods")
+        void find_shouldAlwaysCallBothRepositoryMethods() {
+            //GIVEN
+            when(repository.findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+            when(repository.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID))
+                    .thenReturn(List.of());
+
+            //WHEN
+            adapter.findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+
+            //THEN
+            verify(repository).findByQuestionnaireIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+            verify(repository).findByCollectionInstrumentIdAndInterrogationId(COLLECTION_INSTRUMENT_ID, INTERROGATION_ID);
+        }
+    }
+
+    //UTILS
+    private ContextualPreviousVariableModel buildModel(String interrogationId) {
+        return ContextualPreviousVariableModel.builder()
+                .interrogationId(interrogationId)
+                .collectionInstrumentId(COLLECTION_INSTRUMENT_ID)
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/DataProcessingContextMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/DataProcessingContextMongoAdapterTest.java
new file mode 100644
index 00000000..c1651a12
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/DataProcessingContextMongoAdapterTest.java
@@ -0,0 +1,456 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.Constants;
+import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
+import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
+import fr.insee.genesis.domain.model.context.schedule.ServiceToCall;
+import fr.insee.genesis.infrastructure.document.context.DataProcessingContextDocument;
+import fr.insee.genesis.infrastructure.repository.DataProcessingContextMongoDBRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("DataProcessingContextMongoAdapter tests")
+class DataProcessingContextMongoAdapterTest {
+
+    private static final String PARTITION_ID = "partition-123";
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-456";
+
+    @Mock
+    private DataProcessingContextMongoDBRepository dataProcessingContextMongoDBRepository;
+
+    @Mock
+    private MongoTemplate mongoTemplate;
+
+    @InjectMocks
+    private DataProcessingContextMongoAdapter adapter;
+
+    @Nested
+    @DisplayName("findByCollectionInstrumentId() tests")
+    class FindByCollectionInstrumentIdTests {
+
+        @Test
+        @DisplayName("Should return null when repository returns empty list")
+        void findByCollectionInstrumentId_noDocument_shouldReturnNull() {
+            //GIVEN
+            when(dataProcessingContextMongoDBRepository.findByCollectionInstrumentIdList(List.of(COLLECTION_INSTRUMENT_ID)))
+                    .thenReturn(List.of());
+
+            //WHEN
+            DataProcessingContextModel result = adapter.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            assertThat(result).isNull();
+        }
+
+        @Test
+        @DisplayName("Should return a non-null model when repository returns a document")
+        void findByCollectionInstrumentId_withDocument_shouldReturnModel() {
+            //GIVEN
+            DataProcessingContextDocument doc = new DataProcessingContextDocument();
+            when(dataProcessingContextMongoDBRepository.findByCollectionInstrumentIdList(List.of(COLLECTION_INSTRUMENT_ID)))
+                    .thenReturn(List.of(doc));
+
+            //WHEN
+            DataProcessingContextModel result = adapter.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should pass collectionInstrumentId wrapped in a singleton list")
+        void findByCollectionInstrumentId_shouldWrapIdInSingletonList() {
+            //GIVEN
+            when(dataProcessingContextMongoDBRepository.findByCollectionInstrumentIdList(any()))
+                    .thenReturn(List.of());
+
+            //WHEN
+            adapter.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+            //THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<String>> captor = ArgumentCaptor.forClass(List.class);
+            verify(dataProcessingContextMongoDBRepository).findByCollectionInstrumentIdList(captor.capture());
+            assertThat(captor.getValue()).containsExactly(COLLECTION_INSTRUMENT_ID);
+        }
+    }
+
+    @Nested
+    @DisplayName("findByCollectionInstrumentIds() tests")
+    class FindByCollectionInstrumentIdsTests {
+
+        @Test
+        @DisplayName("Should delegate to repository with the full list")
+        void findByCollectionInstrumentIds_shouldCallRepository() {
+            //GIVEN
+            List<String> ids = List.of("id1", "id2");
+            when(dataProcessingContextMongoDBRepository.findByCollectionInstrumentIdList(ids))
+                    .thenReturn(List.of());
+
+            //WHEN
+            List<DataProcessingContextModel> result = adapter.findByCollectionInstrumentIds(ids);
+
+            //THEN
+            verify(dataProcessingContextMongoDBRepository).findByCollectionInstrumentIdList(ids);
+            assertThat(result).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should return empty list when repository returns no documents")
+        void findByCollectionInstrumentIds_noDocuments_shouldReturnEmptyList() {
+            //GIVEN
+            when(dataProcessingContextMongoDBRepository.findByCollectionInstrumentIdList(any()))
+                    .thenReturn(List.of());
+
+            //WHEN
+            List<DataProcessingContextModel> result = adapter.findByCollectionInstrumentIds(List.of("id1"));
+
+            //THEN
+            assertThat(result).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("save() tests")
+    class SaveTests {
+
+        @Test
+        @DisplayName("save() should delegate to repository.save()")
+        void save_shouldCallRepositorySave() {
+            //GIVEN
+            DataProcessingContextDocument doc = new DataProcessingContextDocument();
+
+            //WHEN
+            adapter.save(doc);
+
+            //THEN
+            verify(dataProcessingContextMongoDBRepository).save(doc);
+            verifyNoMoreInteractions(dataProcessingContextMongoDBRepository);
+        }
+    }
+
+    @Nested
+    @DisplayName("saveAll() tests")
+    class SaveAllTests {
+
+        @Test
+        @DisplayName("saveAll() should delegate the full list to repository.saveAll()")
+        void saveAll_shouldCallRepositorySaveAll() {
+            //GIVEN
+            List<DataProcessingContextDocument> docs = List.of(
+                    new DataProcessingContextDocument(),
+                    new DataProcessingContextDocument()
+            );
+
+            //WHEN
+            adapter.saveAll(docs);
+
+            //THEN
+            verify(dataProcessingContextMongoDBRepository).saveAll(docs);
+            verifyNoMoreInteractions(dataProcessingContextMongoDBRepository);
+        }
+
+        @Test
+        @DisplayName("saveAll() with empty list should call repository with empty list")
+        void saveAll_emptyList_shouldCallRepositoryWithEmptyList() {
+            //WHEN
+            adapter.saveAll(List.of());
+
+            //THEN
+            verify(dataProcessingContextMongoDBRepository).saveAll(List.of());
+        }
+    }
+
+    @Nested
+    @DisplayName("findAll() tests")
+    class FindAllTests {
+
+        @Test
+        @DisplayName("findAll() should return what the repository returns")
+        void findAll_shouldDelegateToRepository() {
+            //GIVEN
+            List<DataProcessingContextDocument> docs = List.of(new DataProcessingContextDocument());
+            when(dataProcessingContextMongoDBRepository.findAll()).thenReturn(docs);
+
+            //WHEN
+            List<DataProcessingContextDocument> result = adapter.findAll();
+
+            //THEN
+            assertThat(result).isEqualTo(docs);
+        }
+
+        @Test
+        @DisplayName("findAll() should return empty list when repository is empty")
+        void findAll_empty_shouldReturnEmptyList() {
+            //GIVEN
+            when(dataProcessingContextMongoDBRepository.findAll()).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findAll()).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("count() tests")
+    class CountTests {
+
+        @Test
+        @DisplayName("count() should return the value from repository")
+        void count_shouldReturnRepositoryValue() {
+            //GIVEN
+            when(dataProcessingContextMongoDBRepository.count()).thenReturn(42L);
+
+            //WHEN + THEN
+            assertThat(adapter.count()).isEqualTo(42L);
+        }
+
+        @Test
+        @DisplayName("count() should return 0 when repository is empty")
+        void count_empty_shouldReturnZero() {
+
+            //GIVEN
+            when(dataProcessingContextMongoDBRepository.count()).thenReturn(0L);
+
+            //WHEN + THEN
+            assertThat(adapter.count()).isZero();
+        }
+    }
+
+    @Nested
+    @DisplayName("removeExpiredSchedules() tests")
+    class RemoveExpiredSchedulesTests {
+
+        @Test
+        @DisplayName("Should return empty list when no schedule is expired")
+        void removeExpiredSchedules_noExpired_shouldReturnEmptyList() throws IOException {
+            //GIVEN
+            KraftwerkExecutionSchedule future = buildSchedule(LocalDateTime.now().plusDays(1));
+            DataProcessingContextModel model = buildModelWithSchedules(COLLECTION_INSTRUMENT_ID, List.of(future));
+
+            //WHEN
+            List<KraftwerkExecutionSchedule> removed = adapter.removeExpiredSchedules(model);
+
+            //THEN
+            assertThat(removed).isEmpty();
+            verifyNoInteractions(mongoTemplate);
+        }
+
+        @Test
+        @DisplayName("Should return expired schedules and call updateMulti by collectionInstrumentId when set")
+        void removeExpiredSchedules_withCollectionInstrumentId_shouldUpdateByCollectionInstrumentId() throws IOException {
+            //GIVEN
+            KraftwerkExecutionSchedule expired = buildSchedule(LocalDateTime.now().minusDays(1));
+            DataProcessingContextModel model = buildModelWithSchedules(COLLECTION_INSTRUMENT_ID, List.of(expired));
+
+            //WHEN
+            List<KraftwerkExecutionSchedule> removed = adapter.removeExpiredSchedules(model);
+
+            //THEN
+            assertThat(removed).hasSize(1).containsExactly(expired);
+
+            ArgumentCaptor<Query> queryCaptor = ArgumentCaptor.forClass(Query.class);
+            verify(mongoTemplate).updateMulti(
+                    queryCaptor.capture(),
+                    any(Update.class),
+                    eq(Constants.MONGODB_SCHEDULE_COLLECTION_NAME)
+            );
+            // The outer query must filter by collectionInstrumentId
+            assertThat(queryCaptor.getValue().toString()).contains("collectionInstrumentId");
+        }
+
+        @Test
+        @DisplayName("Should call updateMulti by surveyName (partitionId) when collectionInstrumentId is null")
+        //TODO Remove this test when removing partitionId
+        void removeExpiredSchedules_nullCollectionInstrumentId_shouldUpdateByPartitionId() throws IOException {
+            //GIVEN
+            KraftwerkExecutionSchedule expired = buildSchedule(LocalDateTime.now().minusDays(1));
+            DataProcessingContextModel model = buildModelWithSchedules(null, List.of(expired));
+            model.setPartitionId(PARTITION_ID);
+
+            //WHEN
+            List<KraftwerkExecutionSchedule> removed = adapter.removeExpiredSchedules(model);
+
+            assertThat(removed).hasSize(1).containsExactly(expired);
+
+            ArgumentCaptor<Query> queryCaptor = ArgumentCaptor.forClass(Query.class);
+            verify(mongoTemplate).updateMulti(
+                    queryCaptor.capture(),
+                    any(Update.class),
+                    eq(Constants.MONGODB_SCHEDULE_COLLECTION_NAME)
+            );
+
+            //THEN
+            // The outer query must filter by surveyName
+            assertThat(queryCaptor.getValue().toString()).contains("surveyName");
+        }
+
+        @Test
+        @DisplayName("Should remove only expired schedules from a mixed list")
+        void removeExpiredSchedules_mixedList_shouldRemoveOnlyExpired() throws IOException {
+            //GIVEN
+            KraftwerkExecutionSchedule expired = buildSchedule(LocalDateTime.now().minusDays(1));
+            KraftwerkExecutionSchedule future = buildSchedule(LocalDateTime.now().plusDays(1));
+            DataProcessingContextModel model = buildModelWithSchedules(COLLECTION_INSTRUMENT_ID, List.of(expired, future));
+
+            //WHEN
+            List<KraftwerkExecutionSchedule> removed = adapter.removeExpiredSchedules(model);
+
+            //THEN
+            assertThat(removed).hasSize(1).containsExactly(expired);
+            // updateMulti called once, only for the expired one
+            verify(mongoTemplate, times(1)).updateMulti(any(), any(), any(String.class));
+        }
+
+        @Test
+        @DisplayName("Should call updateMulti once per expired schedule")
+        void removeExpiredSchedules_multipleExpired_shouldCallUpdateMultiForEach() throws IOException {
+            //GIVEN
+            KraftwerkExecutionSchedule expired1 = buildSchedule(LocalDateTime.now().minusDays(1));
+            KraftwerkExecutionSchedule expired2 = buildSchedule(LocalDateTime.now().minusDays(2));
+            DataProcessingContextModel model = buildModelWithSchedules(COLLECTION_INSTRUMENT_ID, List.of(expired1, expired2));
+
+            //WHEN
+            List<KraftwerkExecutionSchedule> removed = adapter.removeExpiredSchedules(model);
+
+            //THEN
+            assertThat(removed).hasSize(2);
+            verify(mongoTemplate, times(2)).updateMulti(any(), any(), any(String.class));
+        }
+
+        @Test
+        @DisplayName("Should return empty list when schedule list is empty")
+        void removeExpiredSchedules_emptyScheduleList_shouldReturnEmptyList() throws IOException {
+            //GIVEN
+            DataProcessingContextModel model = buildModelWithSchedules(COLLECTION_INSTRUMENT_ID, List.of());
+
+            //WHEN
+            List<KraftwerkExecutionSchedule> removed = adapter.removeExpiredSchedules(model);
+
+            //THEN
+            assertThat(removed).isEmpty();
+            verifyNoInteractions(mongoTemplate);
+        }
+    }
+    @Nested
+    @DisplayName("findAllByReview() tests")
+    class FindAllByReviewTests {
+
+        @Test
+        @DisplayName("Should return only documents with withReview=true when requested")
+        void findAllByReview_true_shouldReturnOnlyWithReviewDocs() {
+            //GIVEN
+            DataProcessingContextDocument withReview = buildDocWithReview(true);
+            DataProcessingContextDocument withoutReview = buildDocWithReview(false);
+            when(dataProcessingContextMongoDBRepository.findAll()).thenReturn(List.of(withReview, withoutReview));
+
+            //WHEN
+            List<DataProcessingContextDocument> result = adapter.findAllByReview(true);
+
+            //THEN
+            assertThat(result).containsExactly(withReview);
+        }
+
+        @Test
+        @DisplayName("Should return only documents with withReview=false when requested")
+        void findAllByReview_false_shouldReturnOnlyWithoutReviewDocs() {
+            //GIVEN
+            DataProcessingContextDocument withReview = buildDocWithReview(true);
+            DataProcessingContextDocument withoutReview = buildDocWithReview(false);
+            when(dataProcessingContextMongoDBRepository.findAll()).thenReturn(List.of(withReview, withoutReview));
+
+            //WHEN
+            List<DataProcessingContextDocument> result = adapter.findAllByReview(false);
+
+            //THEN
+            assertThat(result).containsExactly(withoutReview);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when no document matches the review flag")
+        void findAllByReview_noMatch_shouldReturnEmptyList() {
+            //GIVEN
+            DataProcessingContextDocument withoutReview = buildDocWithReview(false);
+            when(dataProcessingContextMongoDBRepository.findAll()).thenReturn(List.of(withoutReview));
+
+            //WHEN
+            List<DataProcessingContextDocument> result = adapter.findAllByReview(true);
+
+            //THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should return all documents when all match the review flag")
+        void findAllByReview_allMatch_shouldReturnAll() {
+            //GIVEN
+            DataProcessingContextDocument d1 = buildDocWithReview(true);
+            DataProcessingContextDocument d2 = buildDocWithReview(true);
+            when(dataProcessingContextMongoDBRepository.findAll()).thenReturn(List.of(d1, d2));
+
+            //WHEN
+            List<DataProcessingContextDocument> result = adapter.findAllByReview(true);
+
+            //THEN
+            assertThat(result).hasSize(2).containsExactly(d1, d2);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when repository is empty")
+        void findAllByReview_emptyRepository_shouldReturnEmptyList() {
+            //GIVEN
+            when(dataProcessingContextMongoDBRepository.findAll()).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findAllByReview(true)).isEmpty();
+            assertThat(adapter.findAllByReview(false)).isEmpty();
+        }
+    }
+
+    //UTILS
+    private KraftwerkExecutionSchedule buildSchedule(LocalDateTime endDate) {
+        return new KraftwerkExecutionSchedule(
+                "0 10 * * *",
+                ServiceToCall.GENESIS,
+                LocalDateTime.now(),
+                endDate,
+                null
+        );
+    }
+
+    private DataProcessingContextModel buildModelWithSchedules(String collectionInstrumentId,
+                                                               List<KraftwerkExecutionSchedule> schedules) {
+        return DataProcessingContextModel.builder()
+                .collectionInstrumentId(collectionInstrumentId)
+                .kraftwerkExecutionScheduleList(schedules)
+                .build();
+    }
+
+    private DataProcessingContextDocument buildDocWithReview(boolean withReview) {
+        DataProcessingContextDocument doc = new DataProcessingContextDocument();
+        doc.setWithReview(withReview);
+        return doc;
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/LastJsonExtractionMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/LastJsonExtractionMongoAdapterTest.java
new file mode 100644
index 00000000..63044329
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/LastJsonExtractionMongoAdapterTest.java
@@ -0,0 +1,254 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.domain.model.extraction.json.LastJsonExtractionModel;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.infrastructure.document.extraction.json.LastJsonExtractionDocument;
+import fr.insee.genesis.infrastructure.repository.LastJsonExtractionMongoDBRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("LastJsonExtractionMongoAdapter tests")
+class LastJsonExtractionMongoAdapterTest {
+
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-123";
+    private static final Mode MODE = Mode.WEB;
+    // Expected id format: "{collectionInstrumentId}_{mode}"
+    private static final String EXPECTED_ID = "instrument-123_WEB";
+
+    @Mock
+    private LastJsonExtractionMongoDBRepository extractionRepository;
+
+    @InjectMocks
+    private LastJsonExtractionMongoAdapter adapter;
+
+    @Nested
+    @DisplayName("save() tests")
+    class SaveTests {
+
+        @Test
+        @DisplayName("save() should call repository.save() with a non-null document")
+        void save_shouldCallRepositorySave() {
+            //GIVEN
+            LastJsonExtractionModel model = buildModel();
+
+            //WHEN
+            adapter.save(model);
+
+            //THEN
+            verify(extractionRepository).save(any(LastJsonExtractionDocument.class));
+            verifyNoMoreInteractions(extractionRepository);
+        }
+
+        @Test
+        @DisplayName("save() should map the model to a document before persisting")
+        void save_shouldMapModelToDocument() {
+            //GIVEN
+            LastJsonExtractionModel model = buildModel();
+
+            //WHEN
+            adapter.save(model);
+
+            //THEN
+            ArgumentCaptor<LastJsonExtractionDocument> captor = ArgumentCaptor.forClass(LastJsonExtractionDocument.class);
+            verify(extractionRepository).save(captor.capture());
+            assertThat(captor.getValue()).isNotNull();
+        }
+    }
+
+    @Nested
+    @DisplayName("getLastExecutionDate() tests")
+    class GetLastExecutionDateTests {
+
+        @Test
+        @DisplayName("Should return mapped model when document is found")
+        void getLastExecutionDate_found_shouldReturnModel() throws GenesisException {
+            //GIVEN
+            LastJsonExtractionDocument doc = new LastJsonExtractionDocument();
+            when(extractionRepository.findById(EXPECTED_ID)).thenReturn(Optional.of(doc));
+
+            //WHEN
+            LastJsonExtractionModel result = adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, MODE);
+
+            //THEN
+            assertThat(result).isNotNull();
+            verify(extractionRepository).findById(EXPECTED_ID);
+        }
+
+        @Test
+        @DisplayName("Should throw GenesisException with 404 status when document is not found")
+        void getLastExecutionDate_notFound_shouldThrow404() {
+            //GIVEN
+            when(extractionRepository.findById(EXPECTED_ID)).thenReturn(Optional.empty());
+
+            //WHEN + THEN
+            assertThatThrownBy(() -> adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, MODE))
+                    .isInstanceOf(GenesisException.class)
+                    .satisfies(ex -> {
+                        GenesisException genesisException = (GenesisException) ex;
+                        assertThat(genesisException.getStatus()).isEqualTo(404);
+                    });
+        }
+
+        @Test
+        @DisplayName("Should include collectionInstrumentId in exception message when not found")
+        void getLastExecutionDate_notFound_exceptionMessageShouldContainInstrumentId() {
+            //GIVEN
+            when(extractionRepository.findById(EXPECTED_ID)).thenReturn(Optional.empty());
+
+            //WHEN + THEN
+            assertThatThrownBy(() -> adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, MODE))
+                    .isInstanceOf(GenesisException.class)
+                    .hasMessageContaining(COLLECTION_INSTRUMENT_ID);
+        }
+
+        @Test
+        @DisplayName("Should include mode name in exception message when not found")
+        void getLastExecutionDate_notFound_exceptionMessageShouldContainModeName() {
+            //GIVEN
+            when(extractionRepository.findById(EXPECTED_ID)).thenReturn(Optional.empty());
+
+            //WHEN + THEN
+            assertThatThrownBy(() -> adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, MODE))
+                    .isInstanceOf(GenesisException.class)
+                    .hasMessageContaining(MODE.getModeName());
+        }
+
+        @Test
+        @DisplayName("Should query repository with id formatted as '{collectionInstrumentId}_{mode}'")
+        void getLastExecutionDate_shouldUseCorrectIdFormat() throws GenesisException {
+            //GIVEN
+            LastJsonExtractionDocument doc = new LastJsonExtractionDocument();
+            when(extractionRepository.findById(EXPECTED_ID)).thenReturn(Optional.of(doc));
+
+            //WHEN
+            adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, MODE);
+
+            //THEN
+            ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+            verify(extractionRepository).findById(captor.capture());
+            assertThat(captor.getValue()).isEqualTo(EXPECTED_ID);
+        }
+
+        @Test
+        @DisplayName("Should handle null mode — id should be '{collectionInstrumentId}_null'")
+        void getLastExecutionDate_nullMode_shouldUseNullInId() {
+            //GIVEN
+            String expectedIdWithNullMode = "instrument-123_null";
+            when(extractionRepository.findById(expectedIdWithNullMode)).thenReturn(Optional.empty());
+
+            //WHEN + THEN
+            assertThatThrownBy(() -> adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, null))
+                    .isInstanceOf(GenesisException.class)
+                    .satisfies(ex -> assertThat(((GenesisException) ex).getStatus()).isEqualTo(404));
+
+            verify(extractionRepository).findById(expectedIdWithNullMode);
+        }
+
+        @Test
+        @DisplayName("Exception message should contain 'null' for mode name when mode is null")
+        void getLastExecutionDate_nullMode_exceptionMessageShouldContainNull() {
+            //GIVEN
+            String expectedIdWithNullMode = "instrument-123_null";
+            when(extractionRepository.findById(expectedIdWithNullMode)).thenReturn(Optional.empty());
+
+            //WHEN + THEN
+            assertThatThrownBy(() -> adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, null))
+                    .isInstanceOf(GenesisException.class)
+                    .hasMessageContaining("null");
+        }
+    }
+
+    @Nested
+    @DisplayName("delete() tests")
+    class DeleteTests {
+
+        @Test
+        @DisplayName("delete() should call repository.deleteById() with the correct id")
+        void delete_shouldCallDeleteById() {
+            //WHEN
+            adapter.delete(COLLECTION_INSTRUMENT_ID, MODE);
+
+            //THEN
+            ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+            verify(extractionRepository).deleteById(captor.capture());
+            assertThat(captor.getValue()).isEqualTo(EXPECTED_ID);
+            verifyNoMoreInteractions(extractionRepository);
+        }
+
+        @Test
+        @DisplayName("delete() with null mode should use 'null' in the id")
+        void delete_nullMode_shouldUseNullInId() {
+            //WHEN
+            adapter.delete(COLLECTION_INSTRUMENT_ID, null);
+
+            //THEN
+            ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+            verify(extractionRepository).deleteById(captor.capture());
+            assertThat(captor.getValue()).isEqualTo("instrument-123_null");
+        }
+
+        @Test
+        @DisplayName("delete() id format should match getLastExecutionDate() id format")
+        void delete_idFormatShouldMatchGetLastExecutionDate() throws GenesisException {
+            //GIVEN
+            // Ensure both methods build the id the same way
+            LastJsonExtractionDocument doc = new LastJsonExtractionDocument();
+            when(extractionRepository.findById(any())).thenReturn(Optional.of(doc));
+
+            //WHEN
+            adapter.getLastExecutionDate(COLLECTION_INSTRUMENT_ID, MODE);
+            adapter.delete(COLLECTION_INSTRUMENT_ID, MODE);
+
+            //THEN
+            ArgumentCaptor<String> findCaptor = ArgumentCaptor.forClass(String.class);
+            ArgumentCaptor<String> deleteCaptor = ArgumentCaptor.forClass(String.class);
+            verify(extractionRepository).findById(findCaptor.capture());
+            verify(extractionRepository).deleteById(deleteCaptor.capture());
+
+            assertThat(findCaptor.getValue()).isEqualTo(deleteCaptor.getValue());
+        }
+
+        @Test
+        @DisplayName("delete() should work for all known modes")
+        void delete_shouldWorkForAllModes() {
+            for (Mode mode : Mode.values()) {
+                //GIVEN
+                String expectedId = String.format("%s_%s", COLLECTION_INSTRUMENT_ID, mode);
+
+                //WHEN
+                adapter.delete(COLLECTION_INSTRUMENT_ID, mode);
+
+                //THEN
+                verify(extractionRepository).deleteById(expectedId);
+            }
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Helpers
+    // -------------------------------------------------------------------------
+
+    private LastJsonExtractionModel buildModel() {
+        return LastJsonExtractionModel.builder()
+                .collectionInstrumentId(COLLECTION_INSTRUMENT_ID)
+                .mode(MODE)
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapterTest.java
index 594b1555..33f446e4 100644
--- a/src/test/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapterTest.java
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapterTest.java
@@ -1,97 +1,735 @@
 package fr.insee.genesis.infrastructure.adapter;
 
+import fr.insee.genesis.Constants;
+import fr.insee.genesis.domain.model.surveyunit.GroupedInterrogation;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
-import fr.insee.genesis.stubs.LunaticJsonMongoDBRepositoryStub;
-import org.assertj.core.api.Assertions;
+import fr.insee.genesis.infrastructure.document.surveyunit.GroupedInterrogationDocument;
+import fr.insee.genesis.infrastructure.repository.LunaticJsonMongoDBRepository;
+import org.jspecify.annotations.NonNull;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
 import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
-import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
+@ExtendWith(MockitoExtension.class)
 class LunaticJsonRawDataMongoAdapterTest {
 
-    private LunaticJsonMongoDBRepositoryStub repository;
+    private static final String QUESTIONNAIRE_ID = "questionnaire-123";
+    private static final String CAMPAIGN_ID = "campaign-456";
+    private static final String INTERROGATION_ID = "interrogation-789";
+    private static final Mode MODE = Mode.WEB;
+
+    @Mock
+    private LunaticJsonMongoDBRepository repository;
+
+    @Mock
+    private MongoTemplate mongoTemplate;
+
     @InjectMocks
     private LunaticJsonRawDataMongoAdapter adapter;
-    private LunaticJsonRawDataModel rawData;
-    private LunaticJsonRawDataDocument doc;
-
-    @BeforeEach
-    void setUp() {
-        repository = new LunaticJsonMongoDBRepositoryStub();
-        adapter = new LunaticJsonRawDataMongoAdapter(repository, null);
-        rawData = LunaticJsonRawDataModel.builder()
-                .campaignId("campaign01")
-                .questionnaireId("questionnaire01")
-                .interrogationId("interrogation01")
-                .idUE("idUE01")
-                .mode(Mode.WEB)
-                .build();
-        doc = LunaticJsonRawDataDocument.builder()
-                .campaignId("campaign01")
-                .questionnaireId("questionnaire01")
-                .interrogationId("interrogation01")
-                .idUE("idUE01")
-                .mode(Mode.WEB)
-                .build();
+
+    @Nested
+    @DisplayName("save() tests")
+    class SaveTests {
+
+        @Test
+        @DisplayName("save() should call repository.insert() with a non-null document")
+        void save_shouldCallRepositoryInsert() {
+            //GIVEN
+            LunaticJsonRawDataModel model = buildModel();
+
+            //WHEN
+            adapter.save(model);
+
+            //THEN
+            verify(repository).insert(any(LunaticJsonRawDataDocument.class));
+            verifyNoMoreInteractions(repository);
+        }
+
+        @Test
+        @DisplayName("save() should use insert() and NOT save() to avoid upsert behaviour")
+        void save_shouldUseInsertNotSave() {
+            //WHEN
+            adapter.save(buildModel());
+
+            //THEN
+            verify(repository, never()).save(any());
+            verify(repository).insert(any(LunaticJsonRawDataDocument.class));
+        }
     }
 
-    @Test
-    void testSave() {
-        //WHEN
-        adapter.save(rawData);
-        //THEN
-        Assertions.assertThat(repository.getDocuments()).hasSize(1);
-    }
-
-    @Test
-    void getAllUnprocessedDataTest(){
-        //WHEN
-        repository.getDocuments().add(doc);
-        LunaticJsonRawDataDocument rawData2 = LunaticJsonRawDataDocument.builder()
-                .campaignId("campaign01")
-                .questionnaireId("questionnaire01")
-                .interrogationId("interrogation01")
-                .idUE("idUE01")
-                .mode(Mode.WEB)
-                .processDate(LocalDateTime.now())
-                .build();
-        repository.getDocuments().add(rawData2);
-        //THEN
-        Assertions.assertThat(adapter.getAllUnprocessedData()).hasSize(1);
+    @Nested
+    @DisplayName("getAllUnprocessedData() tests")
+    class GetAllUnprocessedDataTests {
+
+        @Test
+        @DisplayName("Should return mapped models from repository")
+        void getAllUnprocessedData_shouldReturnMappedModels() {
+            //GIVEN
+            when(repository.findByNullProcessDate()).thenReturn(List.of(getDocument()));
+
+            //WHEN
+            List<LunaticJsonRawDataModel> result = adapter.getAllUnprocessedData();
+
+            //THEN
+            assertThat(result).isNotNull().hasSize(1);
+            verify(repository).findByNullProcessDate();
+        }
+
+        @Test
+        @DisplayName("Should return empty list when repository returns no documents")
+        void getAllUnprocessedData_noDocuments_shouldReturnEmptyList() {
+            //GIVEN
+            when(repository.findByNullProcessDate()).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.getAllUnprocessedData()).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("findDistinctQuestionnaireIdsByNullProcessDate() tests")
+    class FindDistinctQuestionnaireIdsByNullProcessDateTests {
+
+        @Test
+        @DisplayName("Should return a Set of ids from repository")
+        void findDistinct_shouldReturnSet() {
+            //GIVEN
+            when(repository.findDistinctQuestionnaireIdByProcessDateIsNull())
+                    .thenReturn(List.of("id1", "id2", "id3"));
+
+            //WHEN
+            Set<String> result = adapter.findDistinctQuestionnaireIdsByNullProcessDate();
+
+            //THEN
+            assertThat(result).containsExactlyInAnyOrder("id1", "id2", "id3");
+        }
+
+        @Test
+        @DisplayName("Should deduplicate ids when repository returns duplicates")
+        void findDistinct_duplicates_shouldDeduplicate() {
+            //GIVEN
+            when(repository.findDistinctQuestionnaireIdByProcessDateIsNull())
+                    .thenReturn(List.of("id1", "id1", "id2"));
+
+            //WHEN
+            Set<String> result = adapter.findDistinctQuestionnaireIdsByNullProcessDate();
+
+            //THEN
+            assertThat(result).hasSize(2).containsExactlyInAnyOrder("id1", "id2");
+        }
+
+        @Test
+        @DisplayName("Should return empty set when repository returns empty list")
+        void findDistinct_empty_shouldReturnEmptySet() {
+            //GIVEN
+            when(repository.findDistinctQuestionnaireIdByProcessDateIsNull()).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findDistinctQuestionnaireIdsByNullProcessDate()).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("findModesByQuestionnaire() tests")
+    class FindModesByQuestionnaireTests {
+
+        @Test
+        @DisplayName("Should return modes as a Set for the given questionnaireId")
+        void findModes_shouldReturnSet() {
+            //GIVEN
+            when(repository.findModesByQuestionnaireId(QUESTIONNAIRE_ID))
+                    .thenReturn(List.of(Mode.WEB, Mode.TEL));
+
+            //WHEN
+            Set<Mode> result = adapter.findModesByQuestionnaire(QUESTIONNAIRE_ID);
+
+            //THEN
+            assertThat(result).containsExactlyInAnyOrder(Mode.WEB, Mode.TEL);
+            verify(repository).findModesByQuestionnaireId(QUESTIONNAIRE_ID);
+        }
+
+        @Test
+        @DisplayName("Should deduplicate modes when repository returns duplicates")
+        void findModes_duplicates_shouldDeduplicate() {
+            //GIVEN
+            when(repository.findModesByQuestionnaireId(QUESTIONNAIRE_ID))
+                    .thenReturn(List.of(Mode.WEB, Mode.WEB, Mode.TEL));
+
+            //WHEN + THEN
+            assertThat(adapter.findModesByQuestionnaire(QUESTIONNAIRE_ID)).hasSize(2);
+        }
+
+        @Test
+        @DisplayName("Should return empty set when no modes found")
+        void findModes_noModes_shouldReturnEmptySet() {
+            //GIVEN
+            when(repository.findModesByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findModesByQuestionnaire(QUESTIONNAIRE_ID)).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("findRawData() tests")
+    class FindRawDataTests {
+
+        @Test
+        @DisplayName("Should delegate to repository and return mapped models")
+        void findRawData_shouldCallRepositoryAndReturnModels() {
+            //GIVEN
+            List<String> interrogationIds = List.of("i1", "i2");
+            when(repository.findByCampaignModeAndInterrogations(CAMPAIGN_ID, MODE, interrogationIds))
+                    .thenReturn(List.of(getDocument()));
+
+            //WHEN
+            List<LunaticJsonRawDataModel> result = adapter.findRawData(CAMPAIGN_ID, MODE, interrogationIds);
+
+            //THEN
+            assertThat(result).isNotNull().hasSize(1);
+            verify(repository).findByCampaignModeAndInterrogations(CAMPAIGN_ID, MODE, interrogationIds);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when repository returns no documents")
+        void findRawData_noDocuments_shouldReturnEmptyList() {
+            //GIVEN
+            when(repository.findByCampaignModeAndInterrogations(any(), any(), any()))
+                    .thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findRawData(CAMPAIGN_ID, MODE, List.of())).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("findRawDataByQuestionnaireId(questionnaireId, mode, interrogationIds) tests")
+    class FindRawDataByQuestionnaireIdWithModeTests {
+
+        @Test
+        @DisplayName("Should delegate to repository and return mapped models")
+        void findRawData_shouldCallRepositoryAndReturnModels() {
+            //GIVEN
+            List<String> interrogationIds = List.of("i1");
+            when(repository.findByQuestionnaireModeAndInterrogations(QUESTIONNAIRE_ID, MODE, interrogationIds))
+                    .thenReturn(List.of(getDocument()));
+
+            //WHEN
+            List<LunaticJsonRawDataModel> result =
+                    adapter.findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, MODE, interrogationIds);
+
+            //THEN
+            assertThat(result).isNotNull().hasSize(1);
+            verify(repository).findByQuestionnaireModeAndInterrogations(QUESTIONNAIRE_ID, MODE, interrogationIds);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when repository returns no documents")
+        void findRawData_noDocuments_shouldReturnEmptyList() {
+            //GIVEN
+            when(repository.findByQuestionnaireModeAndInterrogations(any(), any(), any()))
+                    .thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, MODE, List.of())).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("findRawDataByQuestionnaireId(questionnaireId, pageable) tests")
+    class FindRawDataByQuestionnaireIdPagedTests {
+
+        @Test
+        @DisplayName("Should return a Page of mapped models")
+        void findRawDataPaged_shouldReturnPage() {
+            //GIVEN
+            Pageable pageable = PageRequest.of(0, 10);
+            LunaticJsonRawDataDocument doc = getDocument();
+            Page<LunaticJsonRawDataDocument> docPage = new PageImpl<>(List.of(doc), pageable, 1);
+            when(repository.findByQuestionnaireId(QUESTIONNAIRE_ID, pageable)).thenReturn(docPage);
+
+            //WHEN
+            Page<LunaticJsonRawDataModel> result = adapter.findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, pageable);
+
+            //THEN
+            assertThat(result).isNotNull();
+            assertThat(result.getContent()).hasSize(1);
+            assertThat(result.getTotalElements()).isEqualTo(1);
+        }
+
+        @Test
+        @DisplayName("Should preserve pagination metadata from repository page")
+        void findRawDataPaged_shouldPreservePaginationMetadata() {
+            //GIVEN
+            Pageable pageable = PageRequest.of(2, 5);
+            Page<LunaticJsonRawDataDocument> docPage = new PageImpl<>(List.of(), pageable, 42);
+            when(repository.findByQuestionnaireId(QUESTIONNAIRE_ID, pageable)).thenReturn(docPage);
+
+            //WHEN
+            Page<LunaticJsonRawDataModel> result = adapter.findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, pageable);
+
+            //THEN
+            assertThat(result.getTotalElements()).isEqualTo(42);
+            assertThat(result.getPageable()).isEqualTo(pageable);
+        }
+
+        @Test
+        @DisplayName("Should return empty page when repository returns empty page")
+        void findRawDataPaged_emptyPage_shouldReturnEmptyPage() {
+            //GIVEN
+            Pageable pageable = PageRequest.of(0, 10);
+            when(repository.findByQuestionnaireId(QUESTIONNAIRE_ID, pageable))
+                    .thenReturn(new PageImpl<>(List.of(), pageable, 0));
+
+            //WHEN
+            Page<LunaticJsonRawDataModel> result = adapter.findRawDataByQuestionnaireId(QUESTIONNAIRE_ID, pageable);
+
+            //THEN
+            assertThat(result.getContent()).isEmpty();
+            assertThat(result.getTotalElements()).isZero();
+        }
+    }
+
+    @Nested
+    @DisplayName("findRawDataByInterrogationId() tests")
+    class FindRawDataByInterrogationIdTests {
+
+        @Test
+        @DisplayName("Should delegate to repository and return mapped models")
+        void findRawData_shouldReturnMappedModels() {
+            //GIVEN
+            when(repository.findByInterrogationId(INTERROGATION_ID))
+                    .thenReturn(List.of(getDocument()));
+
+            //WHEN
+            List<LunaticJsonRawDataModel> result = adapter.findRawDataByInterrogationId(INTERROGATION_ID);
+
+            //THEN
+            assertThat(result).isNotNull().hasSize(1);
+            verify(repository).findByInterrogationId(INTERROGATION_ID);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when no document found")
+        void findRawData_noDocument_shouldReturnEmptyList() {
+            //GIVEN
+            when(repository.findByInterrogationId(INTERROGATION_ID)).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findRawDataByInterrogationId(INTERROGATION_ID)).isEmpty();
+        }
+    }
+
+    @Nested
+    @DisplayName("updateProcessDates() tests")
+    class UpdateProcessDatesTests {
+
+        @Test
+        @DisplayName("Should call mongoTemplate.updateMulti() on the correct collection")
+        void updateProcessDates_shouldCallUpdateMultiOnCorrectCollection() {
+            //GIVEN
+            Set<String> ids = Set.of("i1", "i2");
+
+            //WHEN
+            adapter.updateProcessDates(CAMPAIGN_ID, ids);
+
+            //THEN
+            verify(mongoTemplate).updateMulti(
+                    any(Query.class),
+                    any(Update.class),
+                    eq(Constants.MONGODB_LUNATIC_RAWDATA_COLLECTION_NAME)
+            );
+        }
+
+        @Test
+        @DisplayName("Should call updateMulti() exactly once")
+        void updateProcessDates_shouldCallUpdateMultiOnce() {
+            //GIVEN
+            adapter.updateProcessDates(CAMPAIGN_ID, Set.of("i1"));
+
+            //WHEN + THEN
+            verify(mongoTemplate, times(1)).updateMulti(any(), any(), any(String.class));
+        }
+
+        @Test
+        @DisplayName("Should not call repository — only mongoTemplate")
+        void updateProcessDates_shouldNotTouchRepository() {
+            //GIVEN
+            adapter.updateProcessDates(CAMPAIGN_ID, Set.of("i1"));
+
+            //WHEN + THEN
+            verifyNoInteractions(repository);
+        }
+    }
+
+    @Nested
+    @DisplayName("findDistinctQuestionnaireIds() tests")
+    class FindDistinctQuestionnaireIdsTests {
+        private MongoTemplate deepStubMongoTemplate;
+        private LunaticJsonRawDataMongoAdapter localAdapter;
+
+        @BeforeEach
+        void setUp() {
+            deepStubMongoTemplate = mock(MongoTemplate.class, Answers.RETURNS_DEEP_STUBS);
+            localAdapter = new LunaticJsonRawDataMongoAdapter(repository, deepStubMongoTemplate);
+        }
+
+        @Test
+        @DisplayName("Should return non-blank ids as a Set")
+        void findDistinctIds_shouldReturnNonBlankIds() {
+            //GIVEN
+            when(deepStubMongoTemplate.query(LunaticJsonRawDataDocument.class)
+                    .distinct("questionnaireId")
+                    .as(String.class)
+                    .all())
+                    .thenReturn(List.of("id1", "id2", "id3"));
+
+            //WHEN + THEN
+            assertThat(localAdapter.findDistinctQuestionnaireIds())
+                    .containsExactlyInAnyOrder("id1", "id2", "id3");
+        }
+
+        @Test
+        @DisplayName("Should filter out null ids")
+        void findDistinctIds_shouldFilterNulls() {
+            //GIVEN
+            when(deepStubMongoTemplate.query(LunaticJsonRawDataDocument.class)
+                    .distinct("questionnaireId")
+                    .as(String.class)
+                    .all())
+                    .thenReturn(List.of("id1", "id2"));
+
+            //WHEN + THEN
+            assertThat(localAdapter.findDistinctQuestionnaireIds())
+                    .containsExactlyInAnyOrder("id1", "id2");
+        }
+
+        @Test
+        @DisplayName("Should filter out blank ids")
+        void findDistinctIds_shouldFilterBlankIds() {
+            //GIVEN
+            when(deepStubMongoTemplate.query(LunaticJsonRawDataDocument.class)
+                    .distinct("questionnaireId")
+                    .as(String.class)
+                    .all())
+                    .thenReturn(List.of("id1", "  ", "", "id2"));
+
+            //WHEN + THEN
+            assertThat(localAdapter.findDistinctQuestionnaireIds())
+                    .containsExactlyInAnyOrder("id1", "id2");
+        }
+
+        @Test
+        @DisplayName("Should return empty set when all ids are blank or null")
+        void findDistinctIds_allBlankOrNull_shouldReturnEmptySet() {
+            //GIVEN
+            when(deepStubMongoTemplate.query(LunaticJsonRawDataDocument.class)
+                    .distinct("questionnaireId")
+                    .as(String.class)
+                    .all())
+                    .thenReturn(List.of("", " "));
+
+            //WHEN + THEN
+            assertThat(localAdapter.findDistinctQuestionnaireIds()).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should deduplicate ids")
+        void findDistinctIds_duplicates_shouldDeduplicate() {
+            //GIVEN
+            when(deepStubMongoTemplate.query(LunaticJsonRawDataDocument.class)
+                    .distinct("questionnaireId")
+                    .as(String.class)
+                    .all())
+                    .thenReturn(List.of("id1", "id1", "id2"));
+
+            //WHEN + THEN
+            assertThat(localAdapter.findDistinctQuestionnaireIds()).hasSize(2);
+        }
+    }
+
+    @Nested
+    @DisplayName("findByCampaignIdAndDate() tests")
+    class FindByCampaignIdAndDateTests {
+
+        @Test
+        @DisplayName("Should return a Page of mapped models")
+        void findByCampaignIdAndDate_shouldReturnPage() {
+            //GIVEN
+            Pageable pageable = PageRequest.of(0, 10);
+            Instant start = Instant.now().minusSeconds(3600);
+            Instant end = Instant.now();
+            Page<LunaticJsonRawDataDocument> docPage =
+                    new PageImpl<>(List.of(getDocument()), pageable, 1);
+
+            when(repository.findByCampaignIdAndRecordDateBetween(CAMPAIGN_ID, start, end, pageable))
+                    .thenReturn(docPage);
+
+            //WHEN
+            Page<LunaticJsonRawDataModel> result = adapter.findByCampaignIdAndDate(CAMPAIGN_ID, start, end, pageable);
+
+            //THEN
+            assertThat(result.getContent()).hasSize(1);
+            assertThat(result.getTotalElements()).isEqualTo(1);
+        }
+
+        @Test
+        @DisplayName("Should preserve pagination metadata")
+        void findByCampaignIdAndDate_shouldPreserveMetadata() {
+            //GIVEN
+            Pageable pageable = PageRequest.of(1, 5);
+            Instant start = Instant.EPOCH;
+            Instant end = Instant.now();
+            when(repository.findByCampaignIdAndRecordDateBetween(CAMPAIGN_ID, start, end, pageable))
+                    .thenReturn(new PageImpl<>(List.of(), pageable, 100));
+
+            //WHEN
+            Page<LunaticJsonRawDataModel> result = adapter.findByCampaignIdAndDate(CAMPAIGN_ID, start, end, pageable);
+
+            //THEN
+            assertThat(result.getTotalElements()).isEqualTo(100);
+            assertThat(result.getPageable()).isEqualTo(pageable);
+        }
+    }
+
+    @Nested
+    @DisplayName("countRawResponsesByQuestionnaireId() tests")
+    class CountRawResponsesTests {
+
+        @Test
+        @DisplayName("Should return the count from repository")
+        void count_shouldReturnRepositoryValue() {
+            //GIVEN
+            when(repository.countByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(7L);
+
+            //WHEN + THEN
+            assertThat(adapter.countRawResponsesByQuestionnaireId(QUESTIONNAIRE_ID)).isEqualTo(7L);
+        }
+
+        @Test
+        @DisplayName("Should return 0 when repository returns 0")
+        void count_zero_shouldReturnZero() {
+            //GIVEN
+            when(repository.countByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(0L);
+
+            //WHEN + THEN
+            assertThat(adapter.countRawResponsesByQuestionnaireId(QUESTIONNAIRE_ID)).isZero();
+        }
     }
 
-    @Test
-    void findRawDataTest(){
-        //WHEN
-        repository.getDocuments().add(doc);
-        //THEN
-        List<LunaticJsonRawDataModel> rawdatas = adapter.findRawData("campaign01",Mode.WEB,List.of("interrogation01"));
-        Assertions.assertThat(rawdatas).hasSize(1);
+    @Nested
+    @DisplayName("findProcessedIdsGroupedByQuestionnaireSince() tests")
+    class FindProcessedIdsGroupedTests {
+
+        @Test
+        @DisplayName("Should call repository with the given 'since' date and return mapped models")
+        void findProcessedIds_shouldCallRepository() {
+            //GIVEN
+            LocalDateTime since = LocalDateTime.now().minusDays(7);
+            when(repository.aggregateRawGrouped(since)).thenReturn(List.of());
+
+            //WHEN
+            List<GroupedInterrogation> result = adapter.findProcessedIdsGroupedByQuestionnaireSince(since);
+
+            //THEN
+            assertThat(result).isNotNull();
+            verify(repository).aggregateRawGrouped(since);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when repository returns empty list")
+        void findProcessedIds_empty_shouldReturnEmptyList() {
+            //GIVEN
+            when(repository.aggregateRawGrouped(any())).thenReturn(List.of());
+
+            //WHEN + THEN
+            assertThat(adapter.findProcessedIdsGroupedByQuestionnaireSince(LocalDateTime.now())).isEmpty();
+        }
     }
 
-    @Test
-    void existsByInterrogationId_shouldReturnTrue_whenRepositoryReturnsTrue() {
-        // When
-        boolean exists = adapter.existsByInterrogationId(DEFAULT_INTERROGATION_ID);
+    @Nested
+    @DisplayName("findUnprocessedIds() tests")
+    class FindUnprocessedIdsTests {
+
+        @Test
+        @DisplayName("Should delegate to repository and return mapped models")
+        void findUnprocessedIds_shouldCallRepository() {
+            //GIVEN
+            when(repository.aggregateRawGroupedWithNullProcessDate()).thenReturn(List.of());
 
-        // Then
-        Assertions.assertThat(exists).isTrue();
+            //WHEN
+            List<GroupedInterrogation> result = adapter.findUnprocessedIds();
+
+            //THEN
+            assertThat(result).isNotNull();
+            verify(repository).aggregateRawGroupedWithNullProcessDate();
+        }
     }
 
-    @Test
-    void existsByInterrogationId_shouldReturnFalse_whenRepositoryReturnsFalse() {
-        // When
-        boolean exists = adapter.existsByInterrogationId("unknown-id");
+    @Nested
+    @DisplayName("findUnprocessedInterrogationIdsByCollectionInstrumentId() tests")
+    class FindUnprocessedInterrogationIdsByCollectionInstrumentIdTests {
+
+        @Test
+        @DisplayName("Should return empty set when repository returns no grouped documents")
+        void findUnprocessed_noDocuments_shouldReturnEmptySet() {
+            //GIVEN
+            when(repository.aggregateRawGroupedWithNullProcessDate(QUESTIONNAIRE_ID)).thenReturn(List.of());
+
+            //WHEN
+            Set<String> result = adapter.findUnprocessedInterrogationIdsByCollectionInstrumentId(QUESTIONNAIRE_ID);
+
+            //THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should aggregate all interrogation ids from grouped documents")
+        void findUnprocessed_withDocuments_shouldAggregateAllIds() {
+            //GIVEN
+            var doc1 = mock(GroupedInterrogationDocument.class);
+            var doc2 = mock(GroupedInterrogationDocument.class);
+            when(doc1.getInterrogationIds()).thenReturn(List.of("i1", "i2"));
+            when(doc2.getInterrogationIds()).thenReturn(List.of("i3"));
+            when(repository.aggregateRawGroupedWithNullProcessDate(QUESTIONNAIRE_ID))
+                    .thenReturn(List.of(doc1, doc2));
+
+            //WHEN
+            Set<String> result = adapter.findUnprocessedInterrogationIdsByCollectionInstrumentId(QUESTIONNAIRE_ID);
+
+            //THEN
+            assertThat(result).containsExactlyInAnyOrder("i1", "i2", "i3");
+        }
+
+        @Test
+        @DisplayName("Should deduplicate interrogation ids across grouped documents")
+        void findUnprocessed_duplicateIds_shouldDeduplicate() {
+            //GIVEN
+            var doc = mock(GroupedInterrogationDocument.class);
+            when(doc.getInterrogationIds()).thenReturn(List.of("i1", "i1", "i2"));
+            when(repository.aggregateRawGroupedWithNullProcessDate(QUESTIONNAIRE_ID))
+                    .thenReturn(List.of(doc));
+
+            //WHEN
+            Set<String> result = adapter.findUnprocessedInterrogationIdsByCollectionInstrumentId(QUESTIONNAIRE_ID);
+
+            //THEN
+            assertThat(result).hasSize(2).containsExactlyInAnyOrder("i1", "i2");
+        }
+    }
+
+    @Nested
+    @DisplayName("existsByInterrogationId() tests")
+    class ExistsByInterrogationIdTests {
+
+        @Test
+        @DisplayName("Should return true when repository finds a match")
+        void exists_found_shouldReturnTrue() {
+            //GIVEN
+            when(repository.existsByInterrogationId(INTERROGATION_ID)).thenReturn(true);
+
+            //WHEN + THEN
+            assertThat(adapter.existsByInterrogationId(INTERROGATION_ID)).isTrue();
+        }
+
+        @Test
+        @DisplayName("Should return false when repository finds no match")
+        void exists_notFound_shouldReturnFalse() {
+            //GIVEN
+            when(repository.existsByInterrogationId(INTERROGATION_ID)).thenReturn(false);
+
+            //WHEN + THEN
+            assertThat(adapter.existsByInterrogationId(INTERROGATION_ID)).isFalse();
+        }
+    }
+
+    @Nested
+    @DisplayName("countDistinctInterrogationIdsByQuestionnaireId() tests")
+    class CountDistinctInterrogationIdsTests {
+
+        @Test
+        @DisplayName("Should return the count from repository")
+        void countDistinct_shouldReturnRepositoryValue() {
+            //GIVEN
+            when(repository.countDistinctInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(15L);
+
+            //WHEN + THEN
+            assertThat(adapter.countDistinctInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID)).isEqualTo(15L);
+        }
+
+        @Test
+        @DisplayName("Should return 0 when repository returns null (null-safety)")
+        void countDistinct_nullFromRepository_shouldReturnZero() {
+            //GIVEN
+            when(repository.countDistinctInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(null);
+
+            //WHEN + THEN
+            assertThat(adapter.countDistinctInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID)).isZero();
+        }
+
+        @Test
+        @DisplayName("Should return 0 when repository returns 0")
+        void countDistinct_zero_shouldReturnZero() {
+            //GIVEN
+            when(repository.countDistinctInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(0L);
+
+            //WHEN + THEN
+            assertThat(adapter.countDistinctInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID)).isZero();
+        }
+    }
+
+    //UTILS
+    private LunaticJsonRawDataModel buildModel() {
+        return LunaticJsonRawDataModel.builder()
+                .questionnaireId(QUESTIONNAIRE_ID)
+                .interrogationId(INTERROGATION_ID)
+                .mode(MODE)
+                .build();
+    }
 
-        // Then
-        Assertions.assertThat(exists).isFalse();
+    private static @NonNull LunaticJsonRawDataDocument getDocument() {
+        return new LunaticJsonRawDataDocument(
+                null,
+                CAMPAIGN_ID,
+                QUESTIONNAIRE_ID,
+                INTERROGATION_ID,
+                "IDUE",
+                Mode.WEB,
+                new HashMap<>(),
+                LocalDateTime.now(),
+                LocalDateTime.now()
+        );
     }
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/LunaticModelMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/LunaticModelMongoAdapterTest.java
new file mode 100644
index 00000000..d9b06be4
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/LunaticModelMongoAdapterTest.java
@@ -0,0 +1,222 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.domain.model.lunaticmodel.LunaticModelModel;
+import fr.insee.genesis.infrastructure.document.lunaticmodel.LunaticModelDocument;
+import fr.insee.genesis.infrastructure.repository.LunaticModelMongoDBRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mongodb.core.MongoTemplate;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("LunaticModelMongoAdapter tests")
+class LunaticModelMongoAdapterTest {
+
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-123";
+
+    @Mock
+    private LunaticModelMongoDBRepository repository;
+
+    @Mock
+    private MongoTemplate mongoTemplate;
+
+    @InjectMocks
+    private LunaticModelMongoAdapter adapter;
+
+    @Nested
+    @DisplayName("save() tests")
+    class SaveTests {
+
+        // save() relies on a MongoTemplate fluent chain:
+        // mongoTemplate.update(...).matching(...).apply(...).upsert()
+        // We use a dedicated adapter with RETURNS_DEEP_STUBS to stub the chain.
+
+        private MongoTemplate deepStubMongoTemplate;
+        private LunaticModelMongoAdapter localAdapter;
+
+        @BeforeEach
+        void setUp() {
+            deepStubMongoTemplate = mock(MongoTemplate.class, Answers.RETURNS_DEEP_STUBS);
+            localAdapter = new LunaticModelMongoAdapter(repository, deepStubMongoTemplate);
+        }
+
+        @Test
+        @DisplayName("save() should call mongoTemplate fluent update chain and upsert")
+        void save_shouldCallUpsertOnMongoTemplate() {
+            // GIVEN
+            LunaticModelModel model = buildModel();
+
+            // WHEN
+            localAdapter.save(model);
+
+            // THEN
+            verify(deepStubMongoTemplate).update(LunaticModelDocument.class);
+        }
+
+        @Test
+        @DisplayName("save() should not interact with the repository")
+        void save_shouldNotTouchRepository() {
+            // GIVEN
+            LunaticModelModel model = buildModel();
+
+            // WHEN
+            localAdapter.save(model);
+
+            // THEN
+            verifyNoInteractions(repository);
+        }
+
+        @Test
+        @DisplayName("save() should work without throwing for a valid model")
+        void save_validModel_shouldNotThrow() {
+            // GIVEN
+            LunaticModelModel model = buildModel();
+
+            // WHEN + THEN
+            org.assertj.core.api.Assertions.assertThatCode(() -> localAdapter.save(model))
+                    .doesNotThrowAnyException();
+        }
+    }
+
+    @Nested
+    @DisplayName("find() tests")
+    class FindTests {
+
+        @Test
+        @DisplayName("Should call both repository methods and merge results")
+        void find_shouldCallBothRepositoryMethods() {
+            // GIVEN
+            LunaticModelDocument doc1 = buildDoc("doc-1");
+            LunaticModelDocument doc2 = buildDoc("doc-2");
+            when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of(doc1));
+            when(repository.findByQuestionnaireId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of(doc2));
+
+            // WHEN
+            List<LunaticModelDocument> result = adapter.find(COLLECTION_INSTRUMENT_ID);
+
+            // THEN
+            verify(repository).findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+            verify(repository).findByQuestionnaireId(COLLECTION_INSTRUMENT_ID);
+            assertThat(result).containsExactlyInAnyOrder(doc1, doc2);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when both repository methods return empty lists")
+        void find_bothEmpty_shouldReturnEmptyList() {
+            // GIVEN
+            when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of());
+            when(repository.findByQuestionnaireId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of());
+
+            // WHEN
+            List<LunaticModelDocument> result = adapter.find(COLLECTION_INSTRUMENT_ID);
+
+            // THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should return only documents from findByCollectionInstrumentId when findByQuestionnaireId returns empty")
+        void find_onlyCollectionInstrumentIdResults_shouldReturnThoseOnly() {
+            // GIVEN
+            LunaticModelDocument doc = buildDoc("doc-1");
+            when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of(doc));
+            when(repository.findByQuestionnaireId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of());
+
+            // WHEN
+            List<LunaticModelDocument> result = adapter.find(COLLECTION_INSTRUMENT_ID);
+
+            // THEN
+            assertThat(result).containsExactly(doc);
+        }
+
+        @Test
+        @DisplayName("Should return only documents from findByQuestionnaireId when findByCollectionInstrumentId returns empty")
+        void find_onlyQuestionnaireIdResults_shouldReturnThoseOnly() {
+            // GIVEN
+            LunaticModelDocument doc = buildDoc("doc-1");
+            when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of());
+            when(repository.findByQuestionnaireId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of(doc));
+
+            // WHEN
+            List<LunaticModelDocument> result = adapter.find(COLLECTION_INSTRUMENT_ID);
+
+            // THEN
+            assertThat(result).containsExactly(doc);
+        }
+
+        @Test
+        @DisplayName("Should deduplicate when the same document is returned by both repository methods")
+        void find_sameDocumentFromBothMethods_shouldDeduplicate() {
+            // GIVEN
+            LunaticModelDocument doc = buildDoc("doc-shared");
+            when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of(doc));
+            when(repository.findByQuestionnaireId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of(doc));
+
+            // WHEN
+            List<LunaticModelDocument> result = adapter.find(COLLECTION_INSTRUMENT_ID);
+
+            // THEN
+            assertThat(result).hasSize(1).containsExactly(doc);
+        }
+
+        @Test
+        @DisplayName("Should pass the same collectionInstrumentId to both repository methods")
+        void find_shouldPassSameIdToBothMethods() {
+            // GIVEN
+            when(repository.findByCollectionInstrumentId(any())).thenReturn(List.of());
+            when(repository.findByQuestionnaireId(any())).thenReturn(List.of());
+
+            // WHEN
+            adapter.find(COLLECTION_INSTRUMENT_ID);
+
+            // THEN
+            verify(repository).findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+            verify(repository).findByQuestionnaireId(COLLECTION_INSTRUMENT_ID);
+        }
+
+        @Test
+        @DisplayName("Should not interact with mongoTemplate")
+        void find_shouldNotTouchMongoTemplate() {
+            // GIVEN
+            when(repository.findByCollectionInstrumentId(any())).thenReturn(List.of());
+            when(repository.findByQuestionnaireId(any())).thenReturn(List.of());
+
+            // WHEN
+            adapter.find(COLLECTION_INSTRUMENT_ID);
+
+            // THEN
+            verifyNoInteractions(mongoTemplate);
+        }
+    }
+
+    //UTILS
+    private LunaticModelModel buildModel() {
+        return new LunaticModelModel(LunaticModelMongoAdapterTest.COLLECTION_INSTRUMENT_ID, null, LocalDateTime.now());
+    }
+
+    private LunaticModelDocument buildDoc(String id) {
+        return new LunaticModelDocument(
+                null,
+                id,
+                new HashMap<>(),
+                LocalDateTime.now()
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/QuestionnaireMetadataMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/QuestionnaireMetadataMongoAdapterTest.java
new file mode 100644
index 00000000..33179518
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/QuestionnaireMetadataMongoAdapterTest.java
@@ -0,0 +1,246 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.bpm.metadata.model.MetadataModel;
+import fr.insee.genesis.domain.model.metadata.QuestionnaireMetadataModel;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.infrastructure.document.metadata.QuestionnaireMetadataDocument;
+import fr.insee.genesis.infrastructure.repository.QuestionnaireMetadataMongoDBRepository;
+import org.jspecify.annotations.NonNull;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("QuestionnaireMetadataMongoAdapter tests")
+class QuestionnaireMetadataMongoAdapterTest {
+
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-123";
+    private static final Mode MODE = Mode.WEB;
+
+    @Mock
+    private QuestionnaireMetadataMongoDBRepository questionnaireMetadataMongoDBRepository;
+
+    @InjectMocks
+    private QuestionnaireMetadataMongoAdapter adapter;
+
+    @Nested
+    @DisplayName("find() tests")
+    class FindTests {
+
+        @Test
+        @DisplayName("Should call both repository methods and return merged mapped models")
+        void find_shouldCallBothRepositoryMethodsAndMergeResults() {
+            // GIVEN
+            QuestionnaireMetadataDocument doc1 = getDocument();
+            QuestionnaireMetadataDocument doc2 = getDocument();
+            when(questionnaireMetadataMongoDBRepository.findByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of(doc1));
+            when(questionnaireMetadataMongoDBRepository.findByCollectionInstrumentIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of(doc2));
+
+            // WHEN
+            List<QuestionnaireMetadataModel> result = adapter.find(COLLECTION_INSTRUMENT_ID, MODE);
+
+            // THEN
+            verify(questionnaireMetadataMongoDBRepository).findByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            verify(questionnaireMetadataMongoDBRepository).findByCollectionInstrumentIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            assertThat(result).isNotNull().hasSize(2);
+        }
+
+        @Test
+        @DisplayName("Should return empty list when both repository methods return empty lists")
+        void find_bothEmpty_shouldReturnEmptyList() {
+            // GIVEN
+            when(questionnaireMetadataMongoDBRepository.findByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of());
+            when(questionnaireMetadataMongoDBRepository.findByCollectionInstrumentIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of());
+
+            // WHEN
+            List<QuestionnaireMetadataModel> result = adapter.find(COLLECTION_INSTRUMENT_ID, MODE);
+
+            // THEN
+            assertThat(result).isEmpty();
+        }
+
+        @Test
+        @DisplayName("Should return only results from findByQuestionnaireIdAndMode when findByCollectionInstrumentIdAndMode is empty")
+        void find_onlyQuestionnaireIdResults_shouldReturnThoseOnly() {
+            // GIVEN
+            when(questionnaireMetadataMongoDBRepository.findByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of(getDocument()));
+            when(questionnaireMetadataMongoDBRepository.findByCollectionInstrumentIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of());
+
+            // WHEN
+            List<QuestionnaireMetadataModel> result = adapter.find(COLLECTION_INSTRUMENT_ID, MODE);
+
+            // THEN
+            assertThat(result).hasSize(1);
+        }
+
+        @Test
+        @DisplayName("Should return only results from findByCollectionInstrumentIdAndMode when findByQuestionnaireIdAndMode is empty")
+        void find_onlyCollectionInstrumentIdResults_shouldReturnThoseOnly() {
+            // GIVEN
+            when(questionnaireMetadataMongoDBRepository.findByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of());
+            when(questionnaireMetadataMongoDBRepository.findByCollectionInstrumentIdAndMode(COLLECTION_INSTRUMENT_ID, MODE))
+                    .thenReturn(List.of(getDocument()));
+
+            // WHEN
+            List<QuestionnaireMetadataModel> result = adapter.find(COLLECTION_INSTRUMENT_ID, MODE);
+
+            // THEN
+            assertThat(result).hasSize(1);
+        }
+
+        @Test
+        @DisplayName("Should pass the same collectionInstrumentId and mode to both repository methods")
+        void find_shouldPassSameArgumentsToBothMethods() {
+            // GIVEN
+            when(questionnaireMetadataMongoDBRepository.findByQuestionnaireIdAndMode(any(), any()))
+                    .thenReturn(List.of());
+            when(questionnaireMetadataMongoDBRepository.findByCollectionInstrumentIdAndMode(any(), any()))
+                    .thenReturn(List.of());
+
+            // WHEN
+            adapter.find(COLLECTION_INSTRUMENT_ID, MODE);
+
+            // THEN
+            verify(questionnaireMetadataMongoDBRepository).findByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            verify(questionnaireMetadataMongoDBRepository).findByCollectionInstrumentIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+        }
+    }
+
+    @Nested
+    @DisplayName("save() tests")
+    class SaveTests {
+
+        @Test
+        @DisplayName("save() should call remove() then repository.save() with a mapped document")
+        void save_shouldRemoveThenPersist() {
+            // GIVEN
+            QuestionnaireMetadataModel model = buildModel();
+
+            // WHEN
+            adapter.save(model);
+
+            // THEN
+            verify(questionnaireMetadataMongoDBRepository).deleteByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            verify(questionnaireMetadataMongoDBRepository).deleteByCollectionInstrumentIdIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            verify(questionnaireMetadataMongoDBRepository).save(any(QuestionnaireMetadataDocument.class));
+        }
+
+        @Test
+        @DisplayName("save() should persist a non-null document")
+        void save_shouldPersistNonNullDocument() {
+            // GIVEN
+            QuestionnaireMetadataModel model = buildModel();
+
+            // WHEN
+            adapter.save(model);
+
+            // THEN
+            ArgumentCaptor<QuestionnaireMetadataDocument> captor =
+                    ArgumentCaptor.forClass(QuestionnaireMetadataDocument.class);
+            verify(questionnaireMetadataMongoDBRepository).save(captor.capture());
+            assertThat(captor.getValue()).isNotNull();
+        }
+
+        @Test
+        @DisplayName("save() should delete before inserting — delete is called before save")
+        void save_deleteShouldBeCalledBeforeSave() {
+            // GIVEN
+            QuestionnaireMetadataModel model = buildModel();
+
+            // WHEN
+            adapter.save(model);
+
+            // THEN
+            org.mockito.InOrder inOrder = inOrder(questionnaireMetadataMongoDBRepository);
+            inOrder.verify(questionnaireMetadataMongoDBRepository).deleteByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            inOrder.verify(questionnaireMetadataMongoDBRepository).deleteByCollectionInstrumentIdIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            inOrder.verify(questionnaireMetadataMongoDBRepository).save(any());
+        }
+    }
+
+    @Nested
+    @DisplayName("remove() tests")
+    class RemoveTests {
+
+        @Test
+        @DisplayName("remove() should call both delete methods on the repository")
+        void remove_shouldCallBothDeleteMethods() {
+            // WHEN
+            adapter.remove(COLLECTION_INSTRUMENT_ID, MODE);
+
+            // THEN
+            verify(questionnaireMetadataMongoDBRepository).deleteByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            verify(questionnaireMetadataMongoDBRepository).deleteByCollectionInstrumentIdIdAndMode(COLLECTION_INSTRUMENT_ID, MODE);
+            verifyNoMoreInteractions(questionnaireMetadataMongoDBRepository);
+        }
+
+        @Test
+        @DisplayName("remove() should pass the same collectionInstrumentId and mode to both delete methods")
+        void remove_shouldPassSameArgumentsToBothMethods() {
+            // WHEN
+            adapter.remove(COLLECTION_INSTRUMENT_ID, MODE);
+
+            // THEN
+            ArgumentCaptor<String> idCaptor1 = ArgumentCaptor.forClass(String.class);
+            ArgumentCaptor<String> idCaptor2 = ArgumentCaptor.forClass(String.class);
+            ArgumentCaptor<Mode> modeCaptor1 = ArgumentCaptor.forClass(Mode.class);
+            ArgumentCaptor<Mode> modeCaptor2 = ArgumentCaptor.forClass(Mode.class);
+
+            verify(questionnaireMetadataMongoDBRepository)
+                    .deleteByQuestionnaireIdAndMode(idCaptor1.capture(), modeCaptor1.capture());
+            verify(questionnaireMetadataMongoDBRepository)
+                    .deleteByCollectionInstrumentIdIdAndMode(idCaptor2.capture(), modeCaptor2.capture());
+
+            assertThat(idCaptor1.getValue()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+            assertThat(idCaptor2.getValue()).isEqualTo(COLLECTION_INSTRUMENT_ID);
+            assertThat(modeCaptor1.getValue()).isEqualTo(MODE);
+            assertThat(modeCaptor2.getValue()).isEqualTo(MODE);
+        }
+
+        @Test
+        @DisplayName("remove() should work for all known modes")
+        void remove_shouldWorkForAllModes() {
+            // WHEN / THEN
+            for (Mode mode : Mode.values()) {
+                adapter.remove(COLLECTION_INSTRUMENT_ID, mode);
+                verify(questionnaireMetadataMongoDBRepository).deleteByQuestionnaireIdAndMode(COLLECTION_INSTRUMENT_ID, mode);
+                verify(questionnaireMetadataMongoDBRepository).deleteByCollectionInstrumentIdIdAndMode(COLLECTION_INSTRUMENT_ID, mode);
+            }
+        }
+    }
+
+    // UTILS
+    private QuestionnaireMetadataModel buildModel() {
+        return new QuestionnaireMetadataModel(COLLECTION_INSTRUMENT_ID, MODE, null);
+    }
+
+    private static @NonNull QuestionnaireMetadataDocument getDocument() {
+        return new QuestionnaireMetadataDocument(
+                null,
+                COLLECTION_INSTRUMENT_ID,
+                Mode.WEB,
+                new MetadataModel()
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/RawResponseModelMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/RawResponseModelMongoAdapterTest.java
deleted file mode 100644
index 6295f92e..00000000
--- a/src/test/java/fr/insee/genesis/infrastructure/adapter/RawResponseModelMongoAdapterTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package fr.insee.genesis.infrastructure.adapter;
-
-import fr.insee.genesis.infrastructure.repository.RawResponseRepository;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class RawResponseModelMongoAdapterTest {
-	
-    static RawResponseRepository mongoRepository = Mockito.mock(RawResponseRepository.class);
-	static RawResponseMongoAdapter rawResponseMongoAdapter;
-
-	@BeforeEach
-	void setUp() {
-		rawResponseMongoAdapter = new RawResponseMongoAdapter(mongoRepository, null);
-	}
-
-	@Test
-	void existsByInterrogationId_shouldReturnTrue_whenRepositoryReturnsTrue() {
-		// Given
-		when(mongoRepository.existsByInterrogationId("UE1100000001")).thenReturn(true);
-
-		// When
-		boolean exists = rawResponseMongoAdapter.existsByInterrogationId("UE1100000001");
-
-		// Then
-		Assertions.assertThat(exists).isTrue();
-		Mockito.verify(mongoRepository).existsByInterrogationId("UE1100000001");
-	}
-
-	@Test
-	void existsByInterrogationId_shouldReturnFalse_whenRepositoryReturnsFalse() {
-		// Given
-		when(mongoRepository.existsByInterrogationId("UE9999999999")).thenReturn(false);
-
-		// When
-		boolean exists = rawResponseMongoAdapter.existsByInterrogationId("UE9999999999");
-
-		// Then
-		Assertions.assertThat(exists).isFalse();
-		Mockito.verify(mongoRepository).existsByInterrogationId("UE9999999999");
-	}
-}
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapterTest.java
new file mode 100644
index 00000000..1548e855
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapterTest.java
@@ -0,0 +1,580 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.Constants;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
+import fr.insee.genesis.infrastructure.document.rawdata.RawResponseDocument;
+import fr.insee.genesis.infrastructure.repository.RawResponseRepository;
+import fr.insee.modelefiliere.ModeDto;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("RawResponseMongoAdapter tests")
+class RawResponseMongoAdapterTest {
+
+	private static final String COLLECTION_INSTRUMENT_ID = "instrument-123";
+	private static final String CAMPAIGN_ID = "campaign-456";
+	private static final String INTERROGATION_ID = "interrogation-789";
+	private static final Mode MODE = Mode.WEB;
+
+	@Mock
+	private RawResponseRepository repository;
+
+	@Mock
+	private MongoTemplate mongoTemplate;
+
+	@InjectMocks
+	private RawResponseMongoAdapter adapter;
+
+	@Nested
+	@DisplayName("findRawResponses() tests")
+	class FindRawResponsesTests {
+
+		@Test
+		@DisplayName("Should delegate to repository using mode jsonName and return mapped models")
+		void findRawResponses_shouldCallRepositoryWithJsonNameAndReturnModels() {
+			// GIVEN
+			List<String> interrogationIds = List.of("i1", "i2");
+			when(repository.findByCollectionInstrumentIdAndModeAndInterrogationIdList(
+					COLLECTION_INSTRUMENT_ID, MODE.getJsonName(), interrogationIds))
+					.thenReturn(List.of(getDocument()));
+
+			// WHEN
+			List<RawResponseModel> result = adapter.findRawResponses(COLLECTION_INSTRUMENT_ID, MODE, interrogationIds);
+
+			// THEN
+			verify(repository).findByCollectionInstrumentIdAndModeAndInterrogationIdList(
+					COLLECTION_INSTRUMENT_ID, MODE.getJsonName(), interrogationIds);
+			assertThat(result).isNotNull().hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should use mode.getJsonName() and not mode.name() or mode.getModeName()")
+		void findRawResponses_shouldUseJsonName() {
+			// GIVEN
+			when(repository.findByCollectionInstrumentIdAndModeAndInterrogationIdList(any(), any(), any()))
+					.thenReturn(List.of());
+
+			// WHEN
+			adapter.findRawResponses(COLLECTION_INSTRUMENT_ID, MODE, List.of());
+
+			// THEN
+			ArgumentCaptor<String> modeCaptor = ArgumentCaptor.forClass(String.class);
+			verify(repository).findByCollectionInstrumentIdAndModeAndInterrogationIdList(
+					any(), modeCaptor.capture(), any());
+			assertThat(modeCaptor.getValue()).isEqualTo(MODE.getJsonName());
+		}
+
+		@Test
+		@DisplayName("Should return empty list when repository returns no documents")
+		void findRawResponses_noDocuments_shouldReturnEmptyList() {
+			// GIVEN
+			when(repository.findByCollectionInstrumentIdAndModeAndInterrogationIdList(any(), any(), any()))
+					.thenReturn(List.of());
+
+			// WHEN
+			List<RawResponseModel> result = adapter.findRawResponses(COLLECTION_INSTRUMENT_ID, MODE, List.of());
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findRawResponsesByInterrogationID() tests")
+	class FindRawResponsesByInterrogationIdTests {
+
+		@Test
+		@DisplayName("Should delegate to repository and return mapped models")
+		void findRawResponsesByInterrogationId_shouldReturnMappedModels() {
+			// GIVEN
+			when(repository.findByInterrogationId(INTERROGATION_ID))
+					.thenReturn(List.of(getDocument()));
+
+			// WHEN
+			List<RawResponseModel> result = adapter.findRawResponsesByInterrogationID(INTERROGATION_ID);
+
+			// THEN
+			verify(repository).findByInterrogationId(INTERROGATION_ID);
+			assertThat(result).isNotNull().hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when no document found")
+		void findRawResponsesByInterrogationId_noDocument_shouldReturnEmptyList() {
+			// GIVEN
+			when(repository.findByInterrogationId(INTERROGATION_ID)).thenReturn(List.of());
+
+			// WHEN
+			List<RawResponseModel> result = adapter.findRawResponsesByInterrogationID(INTERROGATION_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("updateProcessDates() tests")
+	class UpdateProcessDatesTests {
+
+		@Test
+		@DisplayName("Should call mongoTemplate.updateMulti() on the correct collection")
+		void updateProcessDates_shouldCallUpdateMultiOnCorrectCollection() {
+			// GIVEN
+			Set<String> interrogationIds = Set.of("i1", "i2");
+
+			// WHEN
+			adapter.updateProcessDates(COLLECTION_INSTRUMENT_ID, interrogationIds);
+
+			// THEN
+			verify(mongoTemplate).updateMulti(
+					any(Query.class),
+					any(Update.class),
+					eq(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME)
+			);
+		}
+
+		@Test
+		@DisplayName("Should call updateMulti() exactly once")
+		void updateProcessDates_shouldCallUpdateMultiOnce() {
+			// GIVEN
+
+			// WHEN
+			adapter.updateProcessDates(COLLECTION_INSTRUMENT_ID, Set.of("i1"));
+
+			// THEN
+			verify(mongoTemplate, times(1)).updateMulti(any(), any(), any(String.class));
+		}
+
+		@Test
+		@DisplayName("Should not interact with the repository")
+		void updateProcessDates_shouldNotTouchRepository() {
+			// GIVEN
+
+			// WHEN
+			adapter.updateProcessDates(COLLECTION_INSTRUMENT_ID, Set.of("i1"));
+
+			// THEN
+			verifyNoInteractions(repository);
+		}
+	}
+
+	@Nested
+	@DisplayName("getUnprocessedCollectionIds() tests")
+	class GetUnprocessedCollectionIdsTests {
+
+		@Test
+		@DisplayName("Should return list from repository")
+		void getUnprocessedCollectionIds_shouldReturnRepositoryValue() {
+			// GIVEN
+			when(repository.findDistinctCollectionInstrumentIdByProcessDateIsNull())
+					.thenReturn(List.of("id1", "id2"));
+
+			// WHEN
+			List<String> result = adapter.getUnprocessedCollectionIds();
+
+			// THEN
+			assertThat(result).containsExactly("id1", "id2");
+		}
+
+		@Test
+		@DisplayName("Should return empty list when no unprocessed collection ids exist")
+		void getUnprocessedCollectionIds_empty_shouldReturnEmptyList() {
+			// GIVEN
+			when(repository.findDistinctCollectionInstrumentIdByProcessDateIsNull()).thenReturn(List.of());
+
+			// WHEN
+			List<String> result = adapter.getUnprocessedCollectionIds();
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findUnprocessedInterrogationIdsByCollectionInstrumentId() tests")
+	class FindUnprocessedInterrogationIdsTests {
+
+		@Test
+		@DisplayName("Should return a Set of unprocessed interrogation ids")
+		void findUnprocessed_shouldReturnSet() {
+			// GIVEN
+			when(repository.findInterrogationIdByCollectionInstrumentIdAndProcessDateIsNull(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of("i1", "i2", "i3"));
+
+			// WHEN
+			Set<String> result = adapter.findUnprocessedInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("i1", "i2", "i3");
+		}
+
+		@Test
+		@DisplayName("Should deduplicate ids returned by repository")
+		void findUnprocessed_duplicates_shouldDeduplicate() {
+			// GIVEN
+			when(repository.findInterrogationIdByCollectionInstrumentIdAndProcessDateIsNull(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of("i1", "i1", "i2"));
+
+			// WHEN
+			Set<String> result = adapter.findUnprocessedInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).hasSize(2).containsExactlyInAnyOrder("i1", "i2");
+		}
+
+		@Test
+		@DisplayName("Should return empty set when repository returns empty list")
+		void findUnprocessed_empty_shouldReturnEmptySet() {
+			// GIVEN
+			when(repository.findInterrogationIdByCollectionInstrumentIdAndProcessDateIsNull(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of());
+
+			// WHEN
+			Set<String> result = adapter.findUnprocessedInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findModesByCollectionInstrument() tests")
+	class FindModesByCollectionInstrumentTests {
+
+		@Test
+		@DisplayName("Should delegate to repository and return its result")
+		void findModes_shouldReturnRepositoryValue() {
+			// GIVEN
+			List<ModeDto> modes = List.of(mock(ModeDto.class));
+			when(repository.findModesByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(modes);
+
+			// WHEN
+			List<ModeDto> result = adapter.findModesByCollectionInstrument(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(modes);
+			verify(repository).findModesByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when no mode found")
+		void findModes_noModes_shouldReturnEmptyList() {
+			// GIVEN
+			when(repository.findModesByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(List.of());
+
+			// WHEN
+			List<ModeDto> result = adapter.findModesByCollectionInstrument(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findByCampaignIdAndDate() tests")
+	class FindByCampaignIdAndDateTests {
+
+		@Test
+		@DisplayName("Should return a Page of mapped models")
+		void findByCampaignIdAndDate_shouldReturnPage() {
+			// GIVEN
+			Pageable pageable = PageRequest.of(0, 10);
+			Instant start = Instant.now().minusSeconds(3600);
+			Instant end = Instant.now();
+			Page<RawResponseDocument> docPage = new PageImpl<>(List.of(getDocument()), pageable, 1);
+			when(repository.findByCampaignIdAndDate(CAMPAIGN_ID, start, end, pageable)).thenReturn(docPage);
+
+			// WHEN
+			Page<RawResponseModel> result = adapter.findByCampaignIdAndDate(CAMPAIGN_ID, start, end, pageable);
+
+			// THEN
+			assertThat(result.getContent()).hasSize(1);
+			assertThat(result.getTotalElements()).isEqualTo(1);
+		}
+
+		@Test
+		@DisplayName("Should preserve pagination metadata from repository page")
+		void findByCampaignIdAndDate_shouldPreservePaginationMetadata() {
+			// GIVEN
+			Pageable pageable = PageRequest.of(2, 5);
+			Instant start = Instant.EPOCH;
+			Instant end = Instant.now();
+			when(repository.findByCampaignIdAndDate(CAMPAIGN_ID, start, end, pageable))
+					.thenReturn(new PageImpl<>(List.of(), pageable, 77));
+
+			// WHEN
+			Page<RawResponseModel> result = adapter.findByCampaignIdAndDate(CAMPAIGN_ID, start, end, pageable);
+
+			// THEN
+			assertThat(result.getTotalElements()).isEqualTo(77);
+			assertThat(result.getPageable()).isEqualTo(pageable);
+		}
+
+		@Test
+		@DisplayName("Should return empty page when repository returns empty page")
+		void findByCampaignIdAndDate_emptyPage_shouldReturnEmptyPage() {
+			// GIVEN
+			Pageable pageable = PageRequest.of(0, 10);
+			when(repository.findByCampaignIdAndDate(any(), any(), any(), any()))
+					.thenReturn(new PageImpl<>(List.of(), pageable, 0));
+
+			// WHEN
+			Page<RawResponseModel> result = adapter.findByCampaignIdAndDate(CAMPAIGN_ID, Instant.EPOCH, Instant.now(), pageable);
+
+			// THEN
+			assertThat(result.getContent()).isEmpty();
+			assertThat(result.getTotalElements()).isZero();
+		}
+	}
+
+	@Nested
+	@DisplayName("countByCollectionInstrumentId() tests")
+	class CountByCollectionInstrumentIdTests {
+
+		@Test
+		@DisplayName("Should return the count from repository")
+		void count_shouldReturnRepositoryValue() {
+			// GIVEN
+			when(repository.countByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(42L);
+
+			// WHEN
+			long result = adapter.countByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(42L);
+		}
+
+		@Test
+		@DisplayName("Should return 0 when repository returns 0")
+		void count_zero_shouldReturnZero() {
+			// GIVEN
+			when(repository.countByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(0L);
+
+			// WHEN
+			long result = adapter.countByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isZero();
+		}
+	}
+
+	@Nested
+	@DisplayName("findDistinctCollectionInstrumentIds() tests")
+	class FindDistinctCollectionInstrumentIdsTests {
+
+		@Test
+		@DisplayName("Should return a Set of distinct ids from repository")
+		void findDistinct_shouldReturnSet() {
+			// GIVEN
+			when(repository.findDistinctCollectionInstrumentId())
+					.thenReturn(List.of("id1", "id2", "id3"));
+
+			// WHEN
+			Set<String> result = adapter.findDistinctCollectionInstrumentIds();
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("id1", "id2", "id3");
+		}
+
+		@Test
+		@DisplayName("Should deduplicate ids when repository returns duplicates")
+		void findDistinct_duplicates_shouldDeduplicate() {
+			// GIVEN
+			when(repository.findDistinctCollectionInstrumentId())
+					.thenReturn(List.of("id1", "id1", "id2"));
+
+			// WHEN
+			Set<String> result = adapter.findDistinctCollectionInstrumentIds();
+
+			// THEN
+			assertThat(result).hasSize(2).containsExactlyInAnyOrder("id1", "id2");
+		}
+
+		@Test
+		@DisplayName("Should return empty set when repository returns empty list")
+		void findDistinct_empty_shouldReturnEmptySet() {
+			// GIVEN
+			when(repository.findDistinctCollectionInstrumentId()).thenReturn(List.of());
+
+			// WHEN
+			Set<String> result = adapter.findDistinctCollectionInstrumentIds();
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("countDistinctInterrogationIdsByCollectionInstrumentId() tests")
+	class CountDistinctInterrogationIdsTests {
+
+		@Test
+		@DisplayName("Should return the count from repository")
+		void countDistinct_shouldReturnRepositoryValue() {
+			// GIVEN
+			when(repository.countDistinctInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(15L);
+
+			// WHEN
+			long result = adapter.countDistinctInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(15L);
+		}
+
+		@Test
+		@DisplayName("Should return 0 when repository returns null (null-safety)")
+		void countDistinct_nullFromRepository_shouldReturnZero() {
+			// GIVEN
+			when(repository.countDistinctInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(null);
+
+			// WHEN
+			long result = adapter.countDistinctInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isZero();
+		}
+
+		@Test
+		@DisplayName("Should return 0 when repository returns 0")
+		void countDistinct_zero_shouldReturnZero() {
+			// GIVEN
+			when(repository.countDistinctInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(0L);
+
+			// WHEN
+			long result = adapter.countDistinctInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isZero();
+		}
+	}
+
+	@Nested
+	@DisplayName("findByCollectionInstrumentId(pageable) tests")
+	class FindByCollectionInstrumentIdPagedTests {
+
+		@Test
+		@DisplayName("Should return a Page of mapped models")
+		void findPaged_shouldReturnPage() {
+			// GIVEN
+			Pageable pageable = PageRequest.of(0, 10);
+			Page<RawResponseDocument> docPage = new PageImpl<>(List.of(getDocument()), pageable, 1);
+			when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID, pageable)).thenReturn(docPage);
+
+			// WHEN
+			Page<RawResponseModel> result = adapter.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID, pageable);
+
+			// THEN
+			assertThat(result.getContent()).hasSize(1);
+			assertThat(result.getTotalElements()).isEqualTo(1);
+		}
+
+		@Test
+		@DisplayName("Should preserve pagination metadata from repository page")
+		void findPaged_shouldPreservePaginationMetadata() {
+			// GIVEN
+			Pageable pageable = PageRequest.of(3, 5);
+			when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID, pageable))
+					.thenReturn(new PageImpl<>(List.of(), pageable, 50));
+
+			// WHEN
+			Page<RawResponseModel> result = adapter.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID, pageable);
+
+			// THEN
+			assertThat(result.getTotalElements()).isEqualTo(50);
+			assertThat(result.getPageable()).isEqualTo(pageable);
+		}
+
+		@Test
+		@DisplayName("Should return empty page when repository returns empty page")
+		void findPaged_emptyPage_shouldReturnEmptyPage() {
+			// GIVEN
+			Pageable pageable = PageRequest.of(0, 10);
+			when(repository.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID, pageable))
+					.thenReturn(new PageImpl<>(List.of(), pageable, 0));
+
+			// WHEN
+			Page<RawResponseModel> result = adapter.findByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID, pageable);
+
+			// THEN
+			assertThat(result.getContent()).isEmpty();
+			assertThat(result.getTotalElements()).isZero();
+		}
+	}
+
+	@Nested
+	@DisplayName("existsByInterrogationId() tests")
+	class ExistsByInterrogationIdTests {
+
+		@Test
+		@DisplayName("Should return true when repository finds a match")
+		void exists_found_shouldReturnTrue() {
+			// GIVEN
+			when(repository.existsByInterrogationId(INTERROGATION_ID)).thenReturn(true);
+
+			// WHEN
+			boolean result = adapter.existsByInterrogationId(INTERROGATION_ID);
+
+			// THEN
+			assertThat(result).isTrue();
+		}
+
+		@Test
+		@DisplayName("Should return false when repository finds no match")
+		void exists_notFound_shouldReturnFalse() {
+			// GIVEN
+			when(repository.existsByInterrogationId(INTERROGATION_ID)).thenReturn(false);
+
+			// WHEN
+			boolean result = adapter.existsByInterrogationId(INTERROGATION_ID);
+
+			// THEN
+			assertThat(result).isFalse();
+		}
+	}
+
+	//UTILS
+	private RawResponseDocument getDocument() {
+		return new RawResponseDocument(
+				null,
+				INTERROGATION_ID,
+				COLLECTION_INSTRUMENT_ID,
+				MODE.toString(),
+				new HashMap<>(),
+				LocalDateTime.now(),
+				LocalDateTime.now()
+		);
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/RundeckExecutionMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/RundeckExecutionMongoAdapterTest.java
new file mode 100644
index 00000000..627ebdc8
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/RundeckExecutionMongoAdapterTest.java
@@ -0,0 +1,83 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.domain.model.rundeck.RundeckExecution;
+import fr.insee.genesis.infrastructure.document.rundeck.RundeckExecutionDocument;
+import fr.insee.genesis.infrastructure.repository.RundeckExecutionDBRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+@ExtendWith(MockitoExtension.class)
+class RundeckExecutionMongoAdapterTest {
+
+    @Mock
+    private RundeckExecutionDBRepository rundeckExecutionDBRepository;
+
+    @InjectMocks
+    private RundeckExecutionMongoAdapter adapter;
+
+    @Nested
+    @DisplayName("save() tests")
+    class SaveTests {
+
+        @Test
+        @DisplayName("save() should call repository.insert() with a non-null document")
+        void save_shouldCallRepositoryInsertWithNonNullDocument() {
+            // GIVEN
+            RundeckExecution execution = buildExecution();
+
+            // WHEN
+            adapter.save(execution);
+
+            // THEN
+            ArgumentCaptor<RundeckExecutionDocument> captor = ArgumentCaptor.forClass(RundeckExecutionDocument.class);
+            verify(rundeckExecutionDBRepository).insert(captor.capture());
+            assertThat(captor.getValue()).isNotNull();
+        }
+
+        @Test
+        @DisplayName("save() should use insert() and NOT save() to preserve insert-only semantics")
+        void save_shouldUseInsertNotSave() {
+            // GIVEN
+            RundeckExecution execution = buildExecution();
+
+            // WHEN
+            adapter.save(execution);
+
+            // THEN
+            verify(rundeckExecutionDBRepository, never()).save(any());
+            verify(rundeckExecutionDBRepository).insert(any(RundeckExecutionDocument.class));
+        }
+
+        @Test
+        @DisplayName("save() should interact with repository exactly once")
+        void save_shouldInteractWithRepositoryExactlyOnce() {
+            // GIVEN
+            RundeckExecution execution = buildExecution();
+
+            // WHEN
+            adapter.save(execution);
+
+            // THEN
+            verify(rundeckExecutionDBRepository, times(1)).insert(any(RundeckExecutionDocument.class));
+            verifyNoMoreInteractions(rundeckExecutionDBRepository);
+        }
+    }
+
+    //UTILS
+    private RundeckExecution buildExecution() {
+        return new RundeckExecution();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyQualityToolPerretAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyQualityToolPerretAdapterTest.java
new file mode 100644
index 00000000..f5d51aae
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyQualityToolPerretAdapterTest.java
@@ -0,0 +1,170 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import fr.insee.genesis.configuration.Config;
+import fr.insee.genesis.infrastructure.utils.http.HttpUtils;
+import fr.insee.genesis.infrastructure.utils.http.OidcService;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class SurveyQualityToolPerretAdapterTest {
+
+    private static final String SURVEY_QUALITY_TOOL_URL = "https://perret.example.com";
+    private static final String INTERROGATIONS_PATH = "/interrogations";
+
+    @Mock
+    private Config config;
+
+    @Mock
+    private OidcService oidcService;
+
+    @InjectMocks
+    private SurveyQualityToolPerretAdapter adapter;
+
+    @Nested
+    @DisplayName("sendProcessedIds() tests")
+    class SendProcessedIdsTests {
+
+        @Test
+        @DisplayName("Should call HttpUtils.makeApiCall with correct url, path, method, body and oidcService")
+        void sendProcessedIds_shouldCallHttpUtilsWithCorrectArguments() throws IOException {
+            // GIVEN
+            Map<String, Set<String>> processedIds = Map.of("questionnaire-1", Set.of("i1", "i2"));
+            when(config.getSurveyQualityToolUrl()).thenReturn(SURVEY_QUALITY_TOOL_URL);
+
+            try (MockedStatic<HttpUtils> httpUtilsMock = mockStatic(HttpUtils.class)) {
+                httpUtilsMock.when(() -> HttpUtils.makeApiCall(any(), any(), any(), any(), any(), any()))
+                        .thenReturn(ResponseEntity.ok().build());
+
+                // WHEN
+                adapter.sendProcessedIds(processedIds);
+
+                // THEN
+                httpUtilsMock.verify(() -> HttpUtils.makeApiCall(
+                        eq(SURVEY_QUALITY_TOOL_URL),
+                        eq(INTERROGATIONS_PATH),
+                        eq(HttpMethod.POST),
+                        eq(processedIds),
+                        eq(Object.class),
+                        eq(oidcService)
+                ));
+            }
+        }
+
+        @Test
+        @DisplayName("Should use the url from config")
+        void sendProcessedIds_shouldUseUrlFromConfig() throws IOException {
+            // GIVEN
+            when(config.getSurveyQualityToolUrl()).thenReturn(SURVEY_QUALITY_TOOL_URL);
+
+            try (MockedStatic<HttpUtils> httpUtilsMock = mockStatic(HttpUtils.class)) {
+                httpUtilsMock.when(() -> HttpUtils.makeApiCall(any(), any(), any(), any(), any(), any()))
+                        .thenReturn(ResponseEntity.ok().build());
+
+                // WHEN
+                adapter.sendProcessedIds(Map.of());
+
+                // THEN
+                verify(config).getSurveyQualityToolUrl();
+                httpUtilsMock.verify(() -> HttpUtils.makeApiCall(
+                        eq(SURVEY_QUALITY_TOOL_URL), any(), any(), any(), any(), any()
+                ));
+            }
+        }
+
+        @Test
+        @DisplayName("Should use POST as HTTP method")
+        void sendProcessedIds_shouldUsePostMethod() throws IOException {
+            // GIVEN
+            when(config.getSurveyQualityToolUrl()).thenReturn(SURVEY_QUALITY_TOOL_URL);
+
+            try (MockedStatic<HttpUtils> httpUtilsMock = mockStatic(HttpUtils.class)) {
+                httpUtilsMock.when(() -> HttpUtils.makeApiCall(any(), any(), any(), any(), any(), any()))
+                        .thenReturn(ResponseEntity.ok().build());
+
+                // WHEN
+                adapter.sendProcessedIds(Map.of());
+
+                // THEN
+                httpUtilsMock.verify(() -> HttpUtils.makeApiCall(
+                        any(), any(), eq(HttpMethod.POST), any(), any(), any()
+                ));
+            }
+        }
+
+        @Test
+        @DisplayName("Should return the ResponseEntity from HttpUtils")
+        void sendProcessedIds_shouldReturnHttpUtilsResponse() throws IOException {
+            // GIVEN
+            ResponseEntity<Object> expected = ResponseEntity.status(HttpStatus.OK).build();
+            when(config.getSurveyQualityToolUrl()).thenReturn(SURVEY_QUALITY_TOOL_URL);
+
+            try (MockedStatic<HttpUtils> httpUtilsMock = mockStatic(HttpUtils.class)) {
+                httpUtilsMock.when(() -> HttpUtils.makeApiCall(any(), any(), any(), any(), any(), any()))
+                        .thenReturn(expected);
+
+                // WHEN
+                ResponseEntity<Object> result = adapter.sendProcessedIds(Map.of());
+
+                // THEN
+                assertThat(result).isEqualTo(expected);
+            }
+        }
+
+        @Test
+        @DisplayName("Should propagate IOException thrown by HttpUtils")
+        void sendProcessedIds_shouldPropagateIOException() {
+            // GIVEN
+            when(config.getSurveyQualityToolUrl()).thenReturn(SURVEY_QUALITY_TOOL_URL);
+
+            try (MockedStatic<HttpUtils> httpUtilsMock = mockStatic(HttpUtils.class)) {
+                httpUtilsMock.when(() -> HttpUtils.makeApiCall(any(), any(), any(), any(), any(), any()))
+                        .thenThrow(new IOException("Connection refused"));
+
+                // WHEN / THEN
+                org.assertj.core.api.Assertions.assertThatThrownBy(
+                                () -> adapter.sendProcessedIds(Map.of()))
+                        .isInstanceOf(IOException.class)
+                        .hasMessageContaining("Connection refused");
+            }
+        }
+
+        @Test
+        @DisplayName("Should work with an empty processedIds map")
+        void sendProcessedIds_emptyMap_shouldCallHttpUtils() throws IOException {
+            // GIVEN
+            when(config.getSurveyQualityToolUrl()).thenReturn(SURVEY_QUALITY_TOOL_URL);
+
+            try (MockedStatic<HttpUtils> httpUtilsMock = mockStatic(HttpUtils.class)) {
+                httpUtilsMock.when(() -> HttpUtils.makeApiCall(any(), any(), any(), any(), any(), any()))
+                        .thenReturn(ResponseEntity.ok().build());
+
+                // WHEN
+                adapter.sendProcessedIds(Map.of());
+
+                // THEN
+                httpUtilsMock.verify(() -> HttpUtils.makeApiCall(
+                        any(), any(), any(), eq(Map.of()), any(), any()
+                ));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitModelMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitModelMongoAdapterTest.java
deleted file mode 100644
index bd13784f..00000000
--- a/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitModelMongoAdapterTest.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package fr.insee.genesis.infrastructure.adapter;
-
-import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.infrastructure.document.surveyunit.SurveyUnitDocument;
-import fr.insee.genesis.infrastructure.document.surveyunit.VariableDocument;
-import fr.insee.genesis.infrastructure.repository.SurveyUnitMongoDBRepository;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class SurveyUnitModelMongoAdapterTest {
-	
-    static SurveyUnitMongoDBRepository mongoRepository = Mockito.mock(SurveyUnitMongoDBRepository.class);
-	@InjectMocks
-	static SurveyUnitMongoAdapter surveyUnitMongoAdapter;
-	static SurveyUnitDocument suDoc;
-	static SurveyUnitDocument suDoc2;
-	static SurveyUnitDocument suDoc3;
-	static SurveyUnitDocument suDocFiliere;
-
-	@BeforeAll
-	static void setUp() {
-		surveyUnitMongoAdapter = new SurveyUnitMongoAdapter(mongoRepository, null);
-		suDoc= new SurveyUnitDocument();
-		suDoc.setCampaignId("campaignId");
-		suDoc.setInterrogationId("UE1100000001");
-		suDoc.setQuestionnaireId("TEST2023X01");
-		suDoc.setState("COLLECTED");
-		suDoc.setMode("WEB");
-		suDoc.setRecordDate(LocalDateTime.now());
-		suDoc.setCollectedVariables(List.of(new VariableDocument()));
-		suDoc.setExternalVariables(List.of(new VariableDocument()));
-
-		suDoc2= new SurveyUnitDocument();
-		suDoc2.setCampaignId("campaignId");
-		suDoc2.setInterrogationId("UE1100000001");
-		suDoc2.setQuestionnaireId("TEST2023X01");
-		suDoc2.setState("COLLECTED");
-		suDoc2.setMode("TEL");
-		suDoc2.setRecordDate(LocalDateTime.now());
-		suDoc2.setCollectedVariables(List.of(new VariableDocument()));
-		suDoc2.setExternalVariables(List.of(new VariableDocument()));
-
-		suDoc3= new SurveyUnitDocument();
-		suDoc3.setCampaignId("campaignId");
-		suDoc3.setInterrogationId("UE1100000002");
-		suDoc3.setQuestionnaireId("TEST2023X01");
-		suDoc3.setState("COLLECTED");
-		suDoc3.setMode("WEB");
-		suDoc3.setRecordDate(LocalDateTime.now());
-		suDoc3.setCollectedVariables(List.of(new VariableDocument()));
-		suDoc3.setExternalVariables(List.of(new VariableDocument()));
-
-		suDocFiliere= new SurveyUnitDocument();
-		suDocFiliere.setInterrogationId("UE1100000002");
-		suDocFiliere.setCollectionInstrumentId("TEST2023X01");
-		suDocFiliere.setState("COLLECTED");
-		suDocFiliere.setMode("WEB");
-		suDocFiliere.setRecordDate(LocalDateTime.now());
-		suDocFiliere.setCollectedVariables(List.of(new VariableDocument()));
-		suDocFiliere.setExternalVariables(List.of(new VariableDocument()));
-	}
-
-	@Test
-	void shouldReturnListOfSurveyUnitModels_IfIdsFoundInDataBase() {
-		//Given
-		List<SurveyUnitDocument> responses = new ArrayList<>();
-		responses.add(suDoc);
-		responses.add(suDoc2);
-		when(mongoRepository.findByInterrogationIdAndQuestionnaireId(any(String.class), any(String.class))).thenReturn(responses);
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByIds("UE1100000001", "TEST2023X01");
-		// Then
-		Assertions.assertThat(updates).isNotNull().hasSize(2);
-		Assertions.assertThat(updates.getFirst().getMode()).isEqualTo(Mode.WEB);
-	}
-
-	@Test
-	void shouldReturnListOfSurveyUnitModelsDateAfter_IfDifferentDataModels() {
-		//Given
-		when(mongoRepository.findInterrogationIdsByQuestionnaireIdAndDateAfter(any(String.class), any(LocalDateTime.class)))
-				.thenReturn(Collections.singletonList(suDoc));
-		when(mongoRepository.findInterrogationIdsByCollectionInstrumentIdAndDateAfter(any(String.class), any(LocalDateTime.class)))
-				.thenReturn(Collections.singletonList(suDocFiliere));
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findInterrogationIdsByQuestionnaireIdAndDateAfter(
-				"TEST2023X01", LocalDateTime.now().minusHours(1));
-		// Then
-		Assertions.assertThat(updates).isNotNull().hasSize(2);
-		Set<String> interrogationIds = new HashSet<>();
-		for(SurveyUnitModel update: updates){
-			interrogationIds.add(update.getInterrogationId());
-			Assertions.assertThat(update.getMode()).isEqualTo(Mode.WEB);
-			Assertions.assertThat(update.getCollectionInstrumentId()).isEqualTo("TEST2023X01");
-		}
-		Assertions.assertThat(interrogationIds).containsExactlyInAnyOrder("UE1100000001","UE1100000002");
-	}
-
-	@Test
-	void shouldReturnEmptyList_IfIdsNotFoundInDataBase() {
-		//Given
-		when(mongoRepository.findByInterrogationIdAndQuestionnaireId(any(String.class), any(String.class))).thenReturn(List.of());
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByIds("UE1100000001", "TEST2023X01");
-		// Then
-		Assertions.assertThat(updates).isEmpty();
-	}
-
-	@Test
-	void shouldReturnListOfSurveyUnitModels_IfInterrogationIdFoundInDataBase() {
-		//Given
-		List<SurveyUnitDocument> responses = new ArrayList<>();
-		responses.add(suDoc);
-		responses.add(suDoc2);
-		when(mongoRepository.findByInterrogationId(any(String.class))).thenReturn(responses);
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByInterrogationId("UE1100000001");
-		// Then
-		Assertions.assertThat(updates).isNotNull().hasSize(2);
-		Assertions.assertThat(updates.getFirst().getMode()).isEqualTo(Mode.WEB);
-	}
-
-	@Test
-	void shouldReturnEmptyList_IfInterrogationIdNotFoundInDataBase() {
-		//Given
-		when(mongoRepository.findByInterrogationId(any(String.class))).thenReturn(List.of());
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByInterrogationId("UE1100000001");
-		// Then
-		Assertions.assertThat(updates).isEmpty();
-	}
-
-	@Test
-	void shouldReturnListOfSurveyUnitModels_IfQuestionnaireIdFoundInDataBase() {
-		//Given
-		List<SurveyUnitDocument> responses = new ArrayList<>();
-		responses.add(suDoc);
-		responses.add(suDoc2);
-		responses.add(suDoc3);
-		when(mongoRepository.findByQuestionnaireId(any(String.class))).thenReturn(responses.stream());
-		// When
-		Stream<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByQuestionnaireId("TEST2023X01");
-		// Then
-		Assertions.assertThat(updates).isNotNull().hasSize(3);
-	}
-
-	@Test
-	void shouldReturnEmptyList_IfQuestionnaireIdNotFoundInDataBase() {
-		//Given
-		when(mongoRepository.findByQuestionnaireId(any(String.class))).thenReturn(Stream.empty());
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByQuestionnaireId("TEST2023X01").toList();
-		// Then
-		Assertions.assertThat(updates).isEmpty();
-	}
-
-	@Test
-	void shouldReturnListOfSurveyUnitModels_WhenGivenAListOfInterrogationIds() {
-		//Given
-		List<SurveyUnitDocument> responses1 = new ArrayList<>();
-		responses1.add(suDoc);
-		responses1.add(suDoc2);
-		List<SurveyUnitDocument> responses2 = new ArrayList<>();
-		responses2.add(suDoc3);
-		when(mongoRepository.findByInterrogationIdAndQuestionnaireId("UE1100000001", "TEST2023X01")).thenReturn(responses1);
-		when(mongoRepository.findByInterrogationIdAndQuestionnaireId("UE1100000002", "TEST2023X01")).thenReturn(responses2);
-		SurveyUnitModel id1 = SurveyUnitModel.builder().interrogationId("UE1100000001").build();
-		SurveyUnitModel id2 = SurveyUnitModel.builder().interrogationId("UE1100000002").build();
-		List<SurveyUnitModel> ids = List.of(id1, id2);
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByInterrogationIdsAndQuestionnaireId(ids, "TEST2023X01");
-		// Then
-		Assertions.assertThat(updates).isNotNull().hasSize(3);
-		Assertions.assertThat(updates.getFirst().getMode()).isEqualTo(Mode.WEB);
-	}
-
-	@Test
-	void shouldReturnEmptyList_IfInterrogationIdsNotFoundInDataBase() {
-		//Given
-		when(mongoRepository.findByInterrogationIdAndQuestionnaireId(any(String.class),any(String.class))).thenReturn(List.of());
-		SurveyUnitModel id1 = SurveyUnitModel.builder().interrogationId("UE1100000001").build();
-		SurveyUnitModel id2 = SurveyUnitModel.builder().interrogationId("UE1100000002").build();
-		List<SurveyUnitModel> ids = List.of(id1, id2);
-		// When
-		List<SurveyUnitModel> updates = surveyUnitMongoAdapter.findByInterrogationIdsAndQuestionnaireId(ids, "TEST2023X01");
-		// Then
-		Assertions.assertThat(updates).isEmpty();
-	}
-
-	@Test
-	void shouldReturnCampaignCount() {
-		when(mongoRepository.countByCampaignId("CAMP42")).thenReturn(7L);
-
-		long count = surveyUnitMongoAdapter.countByCampaignId("CAMP42");
-		Assertions.assertThat(count).isEqualTo(7L);
-	}
-
-	@Test
-	void shouldReturnZero_whenCountIsEmpty() {
-		when(mongoRepository.countByCampaignId("CAMP999")).thenReturn(0L);
-
-		long count = surveyUnitMongoAdapter.countByCampaignId("CAMP999");
-		Assertions.assertThat(count).isZero();
-	}
-}
diff --git a/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapterTest.java b/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapterTest.java
new file mode 100644
index 00000000..da661f17
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapterTest.java
@@ -0,0 +1,932 @@
+package fr.insee.genesis.infrastructure.adapter;
+
+import com.mongodb.client.DistinctIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import fr.insee.genesis.Constants;
+import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
+import fr.insee.genesis.infrastructure.document.surveyunit.SurveyUnitDocument;
+import fr.insee.genesis.infrastructure.repository.SurveyUnitMongoDBRepository;
+import org.bson.Document;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mongodb.core.MongoTemplate;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("SurveyUnitMongoAdapter tests")
+class SurveyUnitMongoAdapterTest {
+
+	private static final String QUESTIONNAIRE_ID = "questionnaire-123";
+	private static final String COLLECTION_INSTRUMENT_ID = "instrument-456";
+	private static final String INTERROGATION_ID = "interrogation-789";
+	private static final String CAMPAIGN_ID = "campaign-101";
+	private static final String MODE = "CAWI";
+
+	@Mock
+	private SurveyUnitMongoDBRepository mongoRepository;
+
+	@Mock
+	private MongoTemplate mongoTemplate;
+
+	@InjectMocks
+	private SurveyUnitMongoAdapter adapter;
+
+	@Nested
+	@DisplayName("saveAll() tests")
+	class SaveAllTests {
+
+		@Test
+		@DisplayName("Should call repository.insert() with mapped documents")
+		@SuppressWarnings("unchecked")
+		void saveAll_shouldCallRepositoryInsert() {
+			// GIVEN
+			List<SurveyUnitModel> models = List.of(buildModel("i1"), buildModel("i2"));
+
+			// WHEN
+			adapter.saveAll(models);
+
+			// THEN
+			verify(mongoRepository).insert(any(List.class));
+			verifyNoMoreInteractions(mongoRepository);
+		}
+
+		@Test
+		@DisplayName("Should pass as many documents as models provided")
+		@SuppressWarnings("unchecked")
+		void saveAll_shouldMapAllModels() {
+			// GIVEN
+			List<SurveyUnitModel> models = List.of(buildModel("i1"), buildModel("i2"), buildModel("i3"));
+
+			// WHEN
+			adapter.saveAll(models);
+
+			// THEN
+			var captor = org.mockito.ArgumentCaptor.forClass(List.class);
+			verify(mongoRepository).insert(captor.capture());
+			assertThat(captor.getValue()).hasSize(3);
+		}
+	}
+
+	@Nested
+	@DisplayName("findByIds() tests")
+	class FindByIdsTests {
+
+		@Test
+		@DisplayName("Should call both repository methods and return merged results")
+		void findByIds_shouldCallBothRepositoryMethods() {
+			// GIVEN
+			when(mongoRepository.findByInterrogationIdAndCollectionInstrumentId(INTERROGATION_ID, COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of(buildDoc("i1")));
+			when(mongoRepository.findByInterrogationIdAndQuestionnaireId(INTERROGATION_ID, COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of(buildDoc("i2")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByIds(INTERROGATION_ID, COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			verify(mongoRepository).findByInterrogationIdAndCollectionInstrumentId(INTERROGATION_ID, COLLECTION_INSTRUMENT_ID);
+			verify(mongoRepository).findByInterrogationIdAndQuestionnaireId(INTERROGATION_ID, COLLECTION_INSTRUMENT_ID);
+			assertThat(result).hasSize(2);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when both repository methods return empty lists")
+		void findByIds_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findByInterrogationIdAndCollectionInstrumentId(any(), any())).thenReturn(List.of());
+			when(mongoRepository.findByInterrogationIdAndQuestionnaireId(any(), any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByIds(INTERROGATION_ID, COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findByUsualSurveyUnitAndCollectionInstrumentIds() tests")
+	class FindByUsualSurveyUnitTests {
+
+		@Test
+		@DisplayName("Should call both repository methods and merge results")
+		void findByUsualSurveyUnit_shouldCallBothRepositoryMethods() {
+			// GIVEN
+			String usualSurveyUnitId = "usual-001";
+			when(mongoRepository.findByUsualSurveyUnitIdAndCollectionInstrumentId(usualSurveyUnitId, COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of(buildDoc("i1")));
+			when(mongoRepository.findByUsualSurveyUnitIdAndQuestionnaireId(usualSurveyUnitId, COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByUsualSurveyUnitAndCollectionInstrumentIds(usualSurveyUnitId, COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			verify(mongoRepository).findByUsualSurveyUnitIdAndCollectionInstrumentId(usualSurveyUnitId, COLLECTION_INSTRUMENT_ID);
+			verify(mongoRepository).findByUsualSurveyUnitIdAndQuestionnaireId(usualSurveyUnitId, COLLECTION_INSTRUMENT_ID);
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when both repository methods return empty lists")
+		void findByUsualSurveyUnit_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findByUsualSurveyUnitIdAndCollectionInstrumentId(any(), any())).thenReturn(List.of());
+			when(mongoRepository.findByUsualSurveyUnitIdAndQuestionnaireId(any(), any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByUsualSurveyUnitAndCollectionInstrumentIds("usual-001", COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findBySetOfIdsAndQuestionnaireIdAndMode() tests")
+	class FindBySetOfIdsTests {
+
+		@Test
+		@DisplayName("Should delegate to repository and return mapped models")
+		void findBySetOfIds_shouldReturnMappedModels() {
+			// GIVEN
+			List<String> ids = List.of("i1", "i2");
+			when(mongoRepository.findBySetOfIdsAndQuestionnaireIdAndMode(QUESTIONNAIRE_ID, MODE, ids))
+					.thenReturn(List.of(buildDoc("i1")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findBySetOfIdsAndQuestionnaireIdAndMode(QUESTIONNAIRE_ID, MODE, ids);
+
+			// THEN
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when repository returns empty list")
+		void findBySetOfIds_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findBySetOfIdsAndQuestionnaireIdAndMode(any(), any(), any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findBySetOfIdsAndQuestionnaireIdAndMode(QUESTIONNAIRE_ID, MODE, List.of());
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findByInterrogationId() tests")
+	class FindByInterrogationIdTests {
+
+		@Test
+		@DisplayName("Should delegate to repository and return mapped models")
+		void findByInterrogationId_shouldReturnMappedModels() {
+			// GIVEN
+			when(mongoRepository.findByInterrogationId(INTERROGATION_ID))
+					.thenReturn(List.of(buildDoc("i1")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByInterrogationId(INTERROGATION_ID);
+
+			// THEN
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when no document found")
+		void findByInterrogationId_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findByInterrogationId(any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByInterrogationId(INTERROGATION_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findByInterrogationIdsAndQuestionnaireId() tests")
+	class FindByInterrogationIdsAndQuestionnaireIdTests {
+
+		@Test
+		@DisplayName("Should query repository once per model and aggregate results")
+		void findByInterrogationIds_shouldQueryRepositoryForEachModel() {
+			// GIVEN
+			List<SurveyUnitModel> models = List.of(buildModel("i1"), buildModel("i2"));
+			when(mongoRepository.findByInterrogationIdAndQuestionnaireId("i1", QUESTIONNAIRE_ID))
+					.thenReturn(List.of(buildDoc("i1")));
+			when(mongoRepository.findByInterrogationIdAndQuestionnaireId("i2", QUESTIONNAIRE_ID))
+					.thenReturn(List.of(buildDoc("i2")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByInterrogationIdsAndQuestionnaireId(models, QUESTIONNAIRE_ID);
+
+			// THEN
+			verify(mongoRepository, times(2)).findByInterrogationIdAndQuestionnaireId(anyString(), eq(QUESTIONNAIRE_ID));
+			assertThat(result).hasSize(2);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when all repository queries return empty lists")
+		void findByInterrogationIds_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			List<SurveyUnitModel> models = List.of(buildModel("i1"));
+			when(mongoRepository.findByInterrogationIdAndQuestionnaireId(any(), any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByInterrogationIdsAndQuestionnaireId(models, QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+
+		@Test
+		@DisplayName("Should return empty list when input model list is empty")
+		void findByInterrogationIds_emptyInput_shouldReturnEmptyList() {
+			// GIVEN
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findByInterrogationIdsAndQuestionnaireId(List.of(), QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+			verifyNoInteractions(mongoRepository);
+		}
+	}
+
+	@Nested
+	@DisplayName("findByQuestionnaireId() (Stream) tests")
+	class FindByQuestionnaireIdStreamTests {
+
+		@Test
+		@DisplayName("Should return a stream of mapped models")
+		void findByQuestionnaireId_shouldReturnMappedStream() {
+			// GIVEN
+			when(mongoRepository.findByQuestionnaireId(QUESTIONNAIRE_ID))
+					.thenReturn(Stream.of(buildDoc("i1"), buildDoc("i2")));
+
+			// WHEN
+			Stream<SurveyUnitModel> result = adapter.findByQuestionnaireId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isNotNull();
+			assertThat(result.toList()).hasSize(2);
+		}
+
+		@Test
+		@DisplayName("Should return an empty stream when repository returns empty stream")
+		void findByQuestionnaireId_emptyStream_shouldReturnEmptyStream() {
+			// GIVEN
+			when(mongoRepository.findByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(Stream.empty());
+
+			// WHEN
+			Stream<SurveyUnitModel> result = adapter.findByQuestionnaireId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result.toList()).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("deleteByCollectionInstrumentId() tests")
+	class DeleteByCollectionInstrumentIdTests {
+
+		@Test
+		@DisplayName("Should call both delete methods and return the sum of deleted counts")
+		void delete_shouldReturnSumOfDeletedCounts() {
+			// GIVEN
+			when(mongoRepository.deleteByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(3L);
+			when(mongoRepository.deleteByQuestionnaireId(COLLECTION_INSTRUMENT_ID)).thenReturn(2L);
+
+			// WHEN
+			Long result = adapter.deleteByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(5L);
+		}
+
+		@Test
+		@DisplayName("Should return 0 when both delete methods return 0")
+		void delete_nothingDeleted_shouldReturnZero() {
+			// GIVEN
+			when(mongoRepository.deleteByCollectionInstrumentId(any())).thenReturn(0L);
+			when(mongoRepository.deleteByQuestionnaireId(any())).thenReturn(0L);
+
+			// WHEN
+			Long result = adapter.deleteByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isZero();
+		}
+	}
+
+	@Nested
+	@DisplayName("count() tests")
+	class CountTests {
+
+		@Test
+		@DisplayName("Should return the count from repository")
+		void count_shouldReturnRepositoryValue() {
+			// GIVEN
+			when(mongoRepository.count()).thenReturn(99L);
+
+			// WHEN
+			long result = adapter.count();
+
+			// THEN
+			assertThat(result).isEqualTo(99L);
+		}
+	}
+
+	@Nested
+	@DisplayName("findQuestionnaireIdsByCampaignId() tests")
+	class FindQuestionnaireIdsByCampaignIdTests {
+
+		@Test
+		@DisplayName("Should extract questionnaireId from JSON lines returned by repository")
+		void findQuestionnaireIds_shouldExtractFromJson() {
+			// GIVEN
+			when(mongoRepository.findQuestionnaireIdsByCampaignId(CAMPAIGN_ID))
+					.thenReturn(Set.of("{\"questionnaireId\":\"q1\"}", "{\"questionnaireId\":\"q2\"}"));
+
+			// WHEN
+			Set<String> result = adapter.findQuestionnaireIdsByCampaignId(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("q1", "q2");
+		}
+
+		@Test
+		@DisplayName("Should return empty set when repository returns empty set")
+		void findQuestionnaireIds_empty_shouldReturnEmptySet() {
+			// GIVEN
+			when(mongoRepository.findQuestionnaireIdsByCampaignId(CAMPAIGN_ID)).thenReturn(Set.of());
+
+			// WHEN
+			Set<String> result = adapter.findQuestionnaireIdsByCampaignId(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+
+		@Test
+		@DisplayName("Should skip malformed JSON lines without throwing")
+		void findQuestionnaireIds_malformedJson_shouldSkipAndNotThrow() {
+			// GIVEN
+			when(mongoRepository.findQuestionnaireIdsByCampaignId(CAMPAIGN_ID))
+					.thenReturn(Set.of("not-valid-json", "{\"questionnaireId\":\"q1\"}"));
+
+			// WHEN
+			Set<String> result = adapter.findQuestionnaireIdsByCampaignId(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).containsExactly("q1");
+		}
+	}
+
+	@Nested
+	@DisplayName("findQuestionnaireIdsByCampaignIdV2() tests")
+	class FindQuestionnaireIdsByCampaignIdV2Tests {
+
+		@Test
+		@DisplayName("Should extract questionnaireId from JSON lines returned by repository")
+		void findQuestionnaireIdsV2_shouldExtractFromJson() {
+			// GIVEN
+			when(mongoRepository.findQuestionnaireIdsByCampaignIdV2(CAMPAIGN_ID))
+					.thenReturn(Set.of("{\"questionnaireId\":\"q1\"}"));
+
+			// WHEN
+			Set<String> result = adapter.findQuestionnaireIdsByCampaignIdV2(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).containsExactly("q1");
+		}
+
+		@Test
+		@DisplayName("Should return empty set when repository returns empty set")
+		void findQuestionnaireIdsV2_empty_shouldReturnEmptySet() {
+			// GIVEN
+			when(mongoRepository.findQuestionnaireIdsByCampaignIdV2(CAMPAIGN_ID)).thenReturn(Set.of());
+
+			// WHEN
+			Set<String> result = adapter.findQuestionnaireIdsByCampaignIdV2(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findDistinctCampaignIds() tests")
+	class FindDistinctCampaignIdsTests {
+
+		@Test
+		@DisplayName("Should return distinct campaignIds from mongoTemplate collection")
+		void findDistinctCampaignIds_shouldReturnIds() {
+			// GIVEN
+			@SuppressWarnings("unchecked")
+			MongoCollection<Document> mockCollection = mock(MongoCollection.class);
+			@SuppressWarnings("unchecked")
+			DistinctIterable<String> iterable = mock(DistinctIterable.class);
+			@SuppressWarnings("unchecked")
+			MongoCursor<String> cursor = mock(MongoCursor.class);
+			when(mongoTemplate.getCollection(Constants.MONGODB_RESPONSE_COLLECTION_NAME)).thenReturn(mockCollection);
+			when(mockCollection.distinct("campaignId", String.class)).thenReturn(iterable);
+			when(iterable.iterator()).thenReturn(cursor);
+			when(cursor.hasNext()).thenReturn(true, true, false);
+			when(cursor.next()).thenReturn("c1", "c2");
+
+			// WHEN
+			Set<String> result = adapter.findDistinctCampaignIds();
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("c1", "c2");
+		}
+
+		@Test
+		@DisplayName("Should not interact with the repository")
+		@SuppressWarnings("unchecked")
+		void findDistinctCampaignIds_shouldNotTouchRepository() {
+			// GIVEN
+			MongoCollection<Document> mockCollection = mock(MongoCollection.class);
+			DistinctIterable<String> iterable = mock(DistinctIterable.class);
+			MongoCursor<String> cursor = mock(MongoCursor.class);
+			when(mongoTemplate.getCollection(Constants.MONGODB_RESPONSE_COLLECTION_NAME)).thenReturn(mockCollection);
+			when(mockCollection.distinct("campaignId", String.class)).thenReturn(iterable);
+			when(iterable.iterator()).thenReturn(cursor);
+			when(cursor.hasNext()).thenReturn(false);
+
+			// WHEN
+			adapter.findDistinctCampaignIds();
+
+			// THEN
+			verifyNoInteractions(mongoRepository);
+		}
+	}
+
+	@Nested
+	@DisplayName("findInterrogationIdsByCollectionInstrumentId() tests")
+	class FindInterrogationIdsByCollectionInstrumentIdTests {
+
+		@Test
+		@DisplayName("Should call both repository methods and merge results")
+		void findInterrogationIds_shouldCallBothMethods() {
+			// GIVEN
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of(buildDoc("i1")));
+			when(mongoRepository.findInterrogationIdsByQuestionnaireId(COLLECTION_INSTRUMENT_ID))
+					.thenReturn(List.of(buildDoc("i2")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).hasSize(2);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when both repository methods return empty")
+		void findInterrogationIds_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentId(any())).thenReturn(List.of());
+			when(mongoRepository.findInterrogationIdsByQuestionnaireId(any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findInterrogationIdsByQuestionnaireIdAndDateAfter() tests")
+	class FindInterrogationIdsByDateAfterTests {
+
+		@Test
+		@DisplayName("Should call both repository methods with the given date and merge results")
+		void findByDateAfter_shouldCallBothMethods() {
+			// GIVEN
+			LocalDateTime since = LocalDateTime.now().minusDays(7);
+			when(mongoRepository.findInterrogationIdsByQuestionnaireIdAndDateAfter(QUESTIONNAIRE_ID, since))
+					.thenReturn(List.of(buildDoc("i1")));
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentIdAndDateAfter(QUESTIONNAIRE_ID, since))
+					.thenReturn(List.of(buildDoc("i2")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByQuestionnaireIdAndDateAfter(QUESTIONNAIRE_ID, since);
+
+			// THEN
+			assertThat(result).hasSize(2);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when both repository methods return empty")
+		void findByDateAfter_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			LocalDateTime since = LocalDateTime.now();
+			when(mongoRepository.findInterrogationIdsByQuestionnaireIdAndDateAfter(any(), any())).thenReturn(List.of());
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentIdAndDateAfter(any(), any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByQuestionnaireIdAndDateAfter(QUESTIONNAIRE_ID, since);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween() tests")
+	class FindByRecordDateBetweenTests {
+
+		@Test
+		@DisplayName("Should call both repository methods and merge results")
+		void findByRecordDateBetween_shouldCallBothMethods() {
+			// GIVEN
+			LocalDateTime start = LocalDateTime.now().minusDays(10);
+			LocalDateTime end = LocalDateTime.now();
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(COLLECTION_INSTRUMENT_ID, start, end))
+					.thenReturn(List.of(buildDoc("i1")));
+			when(mongoRepository.findInterrogationIdsQuestionnaireIdAndRecordDateBetween(COLLECTION_INSTRUMENT_ID, start, end))
+					.thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(COLLECTION_INSTRUMENT_ID, start, end);
+
+			// THEN
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when both methods return empty")
+		void findByRecordDateBetween_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			LocalDateTime start = LocalDateTime.now().minusDays(1);
+			LocalDateTime end = LocalDateTime.now();
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(any(), any(), any())).thenReturn(List.of());
+			when(mongoRepository.findInterrogationIdsQuestionnaireIdAndRecordDateBetween(any(), any(), any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(COLLECTION_INSTRUMENT_ID, start, end);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("countByCollectionInstrumentId() tests")
+	class CountByCollectionInstrumentIdTests {
+
+		@Test
+		@DisplayName("Should return the count from repository")
+		void count_shouldReturnRepositoryValue() {
+			// GIVEN
+			when(mongoRepository.countByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID)).thenReturn(12L);
+
+			// WHEN
+			long result = adapter.countByCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(12L);
+		}
+	}
+
+	@Nested
+	@DisplayName("findPageableInterrogationIdsByQuestionnaireId() tests")
+	class FindPageableInterrogationIdsTests {
+
+		@Test
+		@DisplayName("Should delegate to repository with skip and limit and return mapped models")
+		void findPageable_shouldReturnMappedModels() {
+			// GIVEN
+			when(mongoRepository.findPageableInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID, 0L, 10L))
+					.thenReturn(List.of(buildDoc("i1")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findPageableInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID, 0L, 10L);
+
+			// THEN
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when repository returns empty list")
+		void findPageable_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findPageableInterrogationIdsByQuestionnaireId(any(), any(), any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findPageableInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID, 0L, 10L);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findModesByCampaignIdV2() tests")
+	class FindModesByCampaignIdV2Tests {
+
+		@Test
+		@DisplayName("Should delegate to repository and return mapped models")
+		void findModes_shouldReturnMappedModels() {
+			// GIVEN
+			when(mongoRepository.findModesByCampaignIdV2(CAMPAIGN_ID)).thenReturn(List.of(buildDoc("i1")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findModesByCampaignIdV2(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when repository returns empty list")
+		void findModes_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findModesByCampaignIdV2(any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findModesByCampaignIdV2(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findModesByQuestionnaireIdV2() tests")
+	class FindModesByQuestionnaireIdV2Tests {
+
+		@Test
+		@DisplayName("Should delegate to repository and return mapped models")
+		void findModes_shouldReturnMappedModels() {
+			// GIVEN
+			when(mongoRepository.findModesByQuestionnaireIdV2(QUESTIONNAIRE_ID)).thenReturn(List.of(buildDoc("i1")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findModesByQuestionnaireIdV2(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when repository returns empty list")
+		void findModes_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findModesByQuestionnaireIdV2(any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findModesByQuestionnaireIdV2(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findInterrogationIdsByCampaignId() tests")
+	class FindInterrogationIdsByCampaignIdTests {
+
+		@Test
+		@DisplayName("Should delegate to repository and return mapped models")
+		void findInterrogationIds_shouldReturnMappedModels() {
+			// GIVEN
+			when(mongoRepository.findInterrogationIdsByCampaignId(CAMPAIGN_ID)).thenReturn(List.of(buildDoc("i1")));
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByCampaignId(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).hasSize(1);
+		}
+
+		@Test
+		@DisplayName("Should return empty list when repository returns empty list")
+		void findInterrogationIds_noResults_shouldReturnEmptyList() {
+			// GIVEN
+			when(mongoRepository.findInterrogationIdsByCampaignId(any())).thenReturn(List.of());
+
+			// WHEN
+			List<SurveyUnitModel> result = adapter.findInterrogationIdsByCampaignId(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("countByCampaignId() tests")
+	class CountByCampaignIdTests {
+
+		@Test
+		@DisplayName("Should return the count from repository")
+		void countByCampaignId_shouldReturnRepositoryValue() {
+			// GIVEN
+			when(mongoRepository.countByCampaignId(CAMPAIGN_ID)).thenReturn(7L);
+
+			// WHEN
+			long result = adapter.countByCampaignId(CAMPAIGN_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(7L);
+		}
+	}
+
+	@Nested
+	@DisplayName("findDistinctQuestionnairesAndCollectionInstrumentIds() tests")
+	class FindDistinctQuestionnairesAndCollectionInstrumentIdsTests {
+
+		@Test
+		@DisplayName("Should collect distinct ids from both questionnaireId and collectionInstrumentId fields")
+		@SuppressWarnings("unchecked")
+		void findDistinct_shouldCollectFromBothFields() {
+			// GIVEN
+			MongoCollection<Document> mockCollection = mock(MongoCollection.class);
+			DistinctIterable<String> questionnaireIterable = mock(DistinctIterable.class);
+			DistinctIterable<String> collectionIterable = mock(DistinctIterable.class);
+			when(mongoTemplate.getCollection(Constants.MONGODB_RESPONSE_COLLECTION_NAME)).thenReturn(mockCollection);
+			when(mockCollection.distinct("questionnaireId", String.class)).thenReturn(questionnaireIterable);
+			when(mockCollection.distinct("collectionInstrumentId", String.class)).thenReturn(collectionIterable);
+			doAnswer(inv -> { ((Set<String>) inv.getArgument(0)).addAll(List.of("q1", "q2")); return null; })
+					.when(questionnaireIterable).into(any());
+			doAnswer(inv -> { ((Set<String>) inv.getArgument(0)).add("c1"); return null; })
+					.when(collectionIterable).into(any());
+
+			// WHEN
+			Set<String> result = adapter.findDistinctQuestionnairesAndCollectionInstrumentIds();
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("q1", "q2", "c1");
+		}
+
+		@Test
+		@DisplayName("Should remove null values from the result set")
+		@SuppressWarnings("unchecked")
+		void findDistinct_shouldRemoveNulls() {
+			// GIVEN
+			MongoCollection<Document> mockCollection = mock(MongoCollection.class);
+			DistinctIterable<String> questionnaireIterable = mock(DistinctIterable.class);
+			DistinctIterable<String> collectionIterable = mock(DistinctIterable.class);
+			when(mongoTemplate.getCollection(Constants.MONGODB_RESPONSE_COLLECTION_NAME)).thenReturn(mockCollection);
+			when(mockCollection.distinct("questionnaireId", String.class)).thenReturn(questionnaireIterable);
+			when(mockCollection.distinct("collectionInstrumentId", String.class)).thenReturn(collectionIterable);
+			doAnswer(inv -> { ((Set<String>) inv.getArgument(0)).add(null); return null; })
+					.when(questionnaireIterable).into(any());
+			doAnswer(inv -> { ((Set<String>) inv.getArgument(0)).add("c1"); return null; })
+					.when(collectionIterable).into(any());
+
+			// WHEN
+			Set<String> result = adapter.findDistinctQuestionnairesAndCollectionInstrumentIds();
+
+			// THEN
+			assertThat(result).doesNotContainNull().containsExactly("c1");
+		}
+	}
+
+	@Nested
+	@DisplayName("findCampaignIdsByQuestionnaireId() tests")
+	class FindCampaignIdsByQuestionnaireIdTests {
+
+		@Test
+		@DisplayName("Should extract campaignId from JSON lines returned by repository")
+		void findCampaignIds_shouldExtractFromJson() {
+			// GIVEN
+			when(mongoRepository.findCampaignIdsByQuestionnaireId(QUESTIONNAIRE_ID))
+					.thenReturn(Set.of("{\"campaignId\":\"c1\"}", "{\"campaignId\":\"c2\"}"));
+
+			// WHEN
+			Set<String> result = adapter.findCampaignIdsByQuestionnaireId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("c1", "c2");
+		}
+
+		@Test
+		@DisplayName("Should return empty set when repository returns empty set")
+		void findCampaignIds_empty_shouldReturnEmptySet() {
+			// GIVEN
+			when(mongoRepository.findCampaignIdsByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(Set.of());
+
+			// WHEN
+			Set<String> result = adapter.findCampaignIdsByQuestionnaireId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+
+		@Test
+		@DisplayName("Should skip malformed JSON lines without throwing")
+		void findCampaignIds_malformedJson_shouldSkipAndNotThrow() {
+			// GIVEN
+			when(mongoRepository.findCampaignIdsByQuestionnaireId(QUESTIONNAIRE_ID))
+					.thenReturn(Set.of("not-valid-json", "{\"campaignId\":\"c1\"}"));
+
+			// WHEN
+			Set<String> result = adapter.findCampaignIdsByQuestionnaireId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).containsExactly("c1");
+		}
+	}
+
+	@Nested
+	@DisplayName("countByQuestionnaireId() tests")
+	class CountByQuestionnaireIdTests {
+
+		@Test
+		@DisplayName("Should return the count from repository")
+		void count_shouldReturnRepositoryValue() {
+			// GIVEN
+			when(mongoRepository.countByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(5L);
+
+			// WHEN
+			long result = adapter.countByQuestionnaireId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(5L);
+		}
+	}
+
+	// -------------------------------------------------------------------------
+	// countDistinctInterrogationIdsByQuestionnaireAndCollectionInstrumentId()
+	// -------------------------------------------------------------------------
+
+	@Nested
+	@DisplayName("countDistinctInterrogationIdsByQuestionnaireAndCollectionInstrumentId() tests")
+	class CountDistinctInterrogationIdsTests {
+
+		@Test
+		@DisplayName("Should count distinct interrogation ids across both repository queries")
+		void countDistinct_shouldReturnDistinctCount() {
+			// GIVEN
+			SurveyUnitDocument d1 = buildDoc("i1");
+			SurveyUnitDocument d2 = buildDoc("i2");
+			SurveyUnitDocument d3 = buildDoc("i1"); // duplicate of d1
+			when(mongoRepository.findInterrogationIdsByQuestionnaireId(QUESTIONNAIRE_ID)).thenReturn(List.of(d1, d2));
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentId(QUESTIONNAIRE_ID)).thenReturn(List.of(d3));
+
+			// WHEN
+			long result = adapter.countDistinctInterrogationIdsByQuestionnaireAndCollectionInstrumentId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isEqualTo(2L);
+		}
+
+		@Test
+		@DisplayName("Should return 0 when both repository methods return empty lists")
+		void countDistinct_noResults_shouldReturnZero() {
+			// GIVEN
+			when(mongoRepository.findInterrogationIdsByQuestionnaireId(any())).thenReturn(List.of());
+			when(mongoRepository.findInterrogationIdsByCollectionInstrumentId(any())).thenReturn(List.of());
+
+			// WHEN
+			long result = adapter.countDistinctInterrogationIdsByQuestionnaireAndCollectionInstrumentId(QUESTIONNAIRE_ID);
+
+			// THEN
+			assertThat(result).isZero();
+		}
+	}
+
+	//UTILS
+	private SurveyUnitModel buildModel(String interrogationId) {
+		return SurveyUnitModel.builder()
+				.interrogationId(interrogationId)
+				.collectionInstrumentId(COLLECTION_INSTRUMENT_ID)
+				.build();
+	}
+
+	private SurveyUnitDocument buildDoc(String interrogationId) {
+		SurveyUnitDocument doc = new SurveyUnitDocument();
+		doc.setInterrogationId(interrogationId);
+		return doc;
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/document/schedule/ScheduleDocumentTest.java b/src/test/java/fr/insee/genesis/infrastructure/document/schedule/ScheduleDocumentTest.java
new file mode 100644
index 00000000..794da062
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/document/schedule/ScheduleDocumentTest.java
@@ -0,0 +1,29 @@
+package fr.insee.genesis.infrastructure.document.schedule;
+
+import fr.insee.genesis.domain.model.context.schedule.KraftwerkExecutionSchedule;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class ScheduleDocumentTest {
+    @Test
+    void constructorTest(){
+        //GIVEN
+        String surveyName = "testSurvey";
+        List<KraftwerkExecutionSchedule> kraftwerkExecutionScheduleList = new ArrayList<>();
+
+        //WHEN
+        ScheduleDocument scheduleDocument = new ScheduleDocument(
+                surveyName,
+                kraftwerkExecutionScheduleList
+        );
+
+        //THEN
+        Assertions.assertThat(scheduleDocument.getSurveyName()).isEqualTo(surveyName);
+        Assertions.assertThat(scheduleDocument.getKraftwerkExecutionScheduleList())
+                .isEqualTo(kraftwerkExecutionScheduleList);
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/mapper/SurveyUnitDocumentMapperImplTest.java b/src/test/java/fr/insee/genesis/infrastructure/mapper/SurveyUnitDocumentMapperImplTest.java
index d6e2e551..cf65838d 100644
--- a/src/test/java/fr/insee/genesis/infrastructure/mapper/SurveyUnitDocumentMapperImplTest.java
+++ b/src/test/java/fr/insee/genesis/infrastructure/mapper/SurveyUnitDocumentMapperImplTest.java
@@ -4,10 +4,10 @@
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.model.surveyunit.VariableModel;
+import fr.insee.genesis.infrastructure.document.surveyunit.SurveyUnitDocument;
+import fr.insee.genesis.infrastructure.document.surveyunit.VariableDocument;
 import fr.insee.genesis.infrastructure.mappers.SurveyUnitDocumentMapper;
 import fr.insee.genesis.infrastructure.mappers.SurveyUnitDocumentMapperImpl;
-import fr.insee.genesis.infrastructure.document.surveyunit.VariableDocument;
-import fr.insee.genesis.infrastructure.document.surveyunit.SurveyUnitDocument;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/fr/insee/genesis/infrastructure/repository/RawResponseInputRepositoryTest.java b/src/test/java/fr/insee/genesis/infrastructure/repository/RawResponseInputRepositoryTest.java
new file mode 100644
index 00000000..27f77833
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/repository/RawResponseInputRepositoryTest.java
@@ -0,0 +1,227 @@
+package fr.insee.genesis.infrastructure.repository;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import fr.insee.modelefiliere.ModeDto;
+import fr.insee.modelefiliere.RawResponseDto;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mongodb.core.MongoTemplate;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("RawResponseInputRepository tests")
+class RawResponseInputRepositoryTest {
+
+    private static final String COLLECTION_NAME = "rawResponses";
+    private static final String INTERROGATION_ID = "interrogation-123";
+    private static final String COLLECTION_INSTRUMENT_ID = "instrument-456";
+
+    @Mock
+    private MongoTemplate mongoTemplate;
+
+    @Mock
+    private ObjectMapper objectMapper;
+
+    @InjectMocks
+    private RawResponseInputRepository repository;
+
+    @Nested
+    @DisplayName("saveAsRawJson() tests")
+    class SaveAsRawJsonTests {
+
+        @Test
+        @DisplayName("Should serialize the DTO to JSON and save to the correct collection")
+        void saveAsRawJson_shouldSerializeAndSave() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto)).thenReturn("{\"interrogationId\":\"interrogation-123\"}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            verify(objectMapper).writeValueAsString(dto);
+            verify(mongoTemplate).save(any(Map.class), eq(COLLECTION_NAME));
+        }
+
+        @Test
+        @DisplayName("Should save a document containing interrogationId")
+        void saveAsRawJson_documentShouldContainInterrogationId() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto)).thenReturn("{}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<Map<String, Object>> captor = ArgumentCaptor.forClass(Map.class);
+            verify(mongoTemplate).save(captor.capture(), eq(COLLECTION_NAME));
+            assertThat(captor.getValue()).containsEntry("interrogationId", INTERROGATION_ID);
+        }
+
+        @Test
+        @DisplayName("Should save a document containing collectionInstrumentId")
+        void saveAsRawJson_documentShouldContainCollectionInstrumentId() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto)).thenReturn("{}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<Map<String, Object>> captor = ArgumentCaptor.forClass(Map.class);
+            verify(mongoTemplate).save(captor.capture(), eq(COLLECTION_NAME));
+            assertThat(captor.getValue()).containsEntry("collectionInstrumentId", COLLECTION_INSTRUMENT_ID);
+        }
+
+        @Test
+        @DisplayName("Should save a document containing mode")
+        void saveAsRawJson_documentShouldContainMode() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto)).thenReturn("{}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<Map<String, Object>> captor = ArgumentCaptor.forClass(Map.class);
+            verify(mongoTemplate).save(captor.capture(), eq(COLLECTION_NAME));
+            assertThat(captor.getValue()).containsEntry("mode", dto.getMode());
+        }
+
+        @Test
+        @DisplayName("Should save a document containing a non-null recordDate")
+        void saveAsRawJson_documentShouldContainRecordDate() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto)).thenReturn("{}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<Map<String, Object>> captor = ArgumentCaptor.forClass(Map.class);
+            verify(mongoTemplate).save(captor.capture(), eq(COLLECTION_NAME));
+            assertThat(captor.getValue()).containsKey("recordDate");
+            assertThat(captor.getValue().get("recordDate")).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should save a document containing a non-null payload")
+        void saveAsRawJson_documentShouldContainPayload() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto))
+                    .thenReturn("{\"interrogationId\":\"interrogation-123\",\"collectionInstrumentId\":\"instrument-456\"}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<Map<String, Object>> captor = ArgumentCaptor.forClass(Map.class);
+            verify(mongoTemplate).save(captor.capture(), eq(COLLECTION_NAME));
+            assertThat(captor.getValue()).containsKey("payload");
+            assertThat(captor.getValue().get("payload")).isNotNull();
+        }
+
+        @Test
+        @DisplayName("Should save to the 'rawResponses' collection exactly")
+        void saveAsRawJson_shouldSaveToCorrectCollection() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto)).thenReturn("{}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            ArgumentCaptor<String> collectionCaptor = ArgumentCaptor.forClass(String.class);
+            verify(mongoTemplate).save(any(), collectionCaptor.capture());
+            assertThat(collectionCaptor.getValue()).isEqualTo(COLLECTION_NAME);
+        }
+
+        @Test
+        @DisplayName("Should call mongoTemplate.save() exactly once")
+        void saveAsRawJson_shouldCallSaveExactlyOnce() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto)).thenReturn("{}");
+
+            // WHEN
+            repository.saveAsRawJson(dto);
+
+            // THEN
+            verify(mongoTemplate, times(1)).save(any(), eq(COLLECTION_NAME));
+            verifyNoMoreInteractions(mongoTemplate);
+        }
+
+        @Test
+        @DisplayName("Should wrap JsonProcessingException in RuntimeException")
+        void saveAsRawJson_jsonProcessingException_shouldThrowRuntimeException() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto))
+                    .thenThrow(new JsonProcessingException("serialization error") {});
+
+            // WHEN / THEN
+            assertThatThrownBy(() -> repository.saveAsRawJson(dto))
+                    .isInstanceOf(RuntimeException.class)
+                    .hasCauseInstanceOf(JsonProcessingException.class)
+                    .hasRootCauseMessage("serialization error");
+        }
+
+        @Test
+        @DisplayName("Should not call mongoTemplate when serialization fails")
+        void saveAsRawJson_jsonProcessingException_shouldNotCallMongoTemplate() throws JsonProcessingException {
+            // GIVEN
+            RawResponseDto dto = buildDto();
+            when(objectMapper.writeValueAsString(dto))
+                    .thenThrow(new JsonProcessingException("serialization error") {});
+
+            // WHEN
+            try {
+                repository.saveAsRawJson(dto);
+            } catch (RuntimeException _) {
+                //Ignored
+            }
+
+            // THEN
+            verifyNoInteractions(mongoTemplate);
+        }
+    }
+
+    //UTILS
+    private RawResponseDto buildDto() {
+        RawResponseDto dto = new RawResponseDto();
+        dto.setInterrogationId(INTERROGATION_ID);
+        dto.setCollectionInstrumentId(COLLECTION_INSTRUMENT_ID);
+        dto.setMode(ModeDto.CAWI);
+        return dto;
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/utils/FileUtilsTest.java b/src/test/java/fr/insee/genesis/infrastructure/utils/FileUtilsTest.java
index cce8868d..c6604caf 100644
--- a/src/test/java/fr/insee/genesis/infrastructure/utils/FileUtilsTest.java
+++ b/src/test/java/fr/insee/genesis/infrastructure/utils/FileUtilsTest.java
@@ -1,57 +1,610 @@
 package fr.insee.genesis.infrastructure.utils;
 
-
-import fr.insee.genesis.TestConstants;
+import fr.insee.genesis.Constants;
 import fr.insee.genesis.configuration.Config;
-import fr.insee.genesis.stubs.ConfigStub;
-import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.Assertions;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.when;
 
-@Slf4j
+@ExtendWith(MockitoExtension.class)
+@DisplayName("FileUtils tests")
 class FileUtilsTest {
 
-	private final Config config = new ConfigStub();
-	private final FileUtils fileUtils= new FileUtils(config);
+	@TempDir
+	Path tempDir;
+
+	@Mock
+	private Config config;
+
+	private FileUtils fileUtils;
+
+	@BeforeEach
+	void setUp() {
+		when(config.getDataFolderSource()).thenReturn(tempDir.toString());
+		when(config.getSpecFolderSource()).thenReturn(tempDir.toString());
+		when(config.getLogFolder()).thenReturn(tempDir.resolve("logs").toString());
+		fileUtils = new FileUtils(config);
+	}
+
+	@Nested
+	@DisplayName("moveFiles() tests")
+	class MoveFilesTests {
+
+		@Test
+		@DisplayName("Should move a file to an existing destination")
+		void moveFiles_existingDestination_shouldMoveFile() throws IOException {
+			// GIVEN
+			Path source = Files.createFile(tempDir.resolve("file.txt"));
+			Path destination = Files.createDirectory(tempDir.resolve("dest"));
+
+			// WHEN
+			fileUtils.moveFiles(source, destination.toString());
+
+			// THEN
+			assertThat(destination.resolve("file.txt")).exists();
+			assertThat(source).doesNotExist();
+		}
+
+		@Test
+		@DisplayName("Should create destination directory if it does not exist")
+		void moveFiles_missingDestination_shouldCreateDirectoryAndMoveFile() throws IOException {
+			// GIVEN
+			Path source = Files.createFile(tempDir.resolve("file.txt"));
+			String destination = tempDir.resolve("new-dest").toString();
+
+			// WHEN
+			fileUtils.moveFiles(source, destination);
+
+			// THEN
+			assertThat(Path.of(destination, "file.txt")).exists();
+		}
+
+		@Test
+		@DisplayName("Should replace existing file at destination")
+		void moveFiles_existingFileAtDestination_shouldReplace() throws IOException {
+			// GIVEN
+			Path source = Files.writeString(tempDir.resolve("file.txt"), "new content");
+			Path destination = Files.createDirectory(tempDir.resolve("dest"));
+			Files.writeString(destination.resolve("file.txt"), "old content");
+
+			// WHEN
+			fileUtils.moveFiles(source, destination.toString());
+
+			// THEN
+			assertThat(Files.readString(destination.resolve("file.txt"))).isEqualTo("new content");
+		}
+	}
+
+	@Nested
+	@DisplayName("moveDataFile() tests")
+	class MoveDataFileTests {
+
+		@Test
+		@DisplayName("Should move file to the DONE folder")
+		void moveDataFile_shouldMoveFileToDoneFolder() throws IOException {
+			// GIVEN
+			Path source = Files.createFile(tempDir.resolve("data.xml"));
+			String campaign = "campaign-2024";
+			String dataSource = "WEB";
+
+			// WHEN
+			fileUtils.moveDataFile(campaign, dataSource, source);
+
+			// THEN
+			Path expectedDest = tempDir.resolve("DONE").resolve(dataSource).resolve(campaign).resolve("data.xml");
+			assertThat(expectedDest).exists();
+		}
+	}
+
+	@Nested
+	@DisplayName("isFilePresent() tests")
+	class IsFilePresentTests {
+
+		@Test
+		@DisplayName("Should return true when file exists")
+		void isFilePresent_existingFile_shouldReturnTrue() throws IOException {
+			// GIVEN
+			Path file = Files.createFile(tempDir.resolve("existing.txt"));
+
+			// WHEN / THEN
+			assertThat(fileUtils.isFilePresent(file.toString())).isTrue();
+		}
+
+		@Test
+		@DisplayName("Should return false when file does not exist")
+		void isFilePresent_missingFile_shouldReturnFalse() {
+			// GIVEN
+
+			// WHEN / THEN
+			assertThat(fileUtils.isFilePresent(tempDir.resolve("missing.txt").toString())).isFalse();
+		}
+	}
+
+	@Nested
+	@DisplayName("isFolderPresent() tests")
+	class IsFolderPresentTests {
+
+		@Test
+		@DisplayName("Should return true when folder exists")
+		void isFolderPresent_existingFolder_shouldReturnTrue() throws IOException {
+			// GIVEN
+			Path folder = Files.createDirectory(tempDir.resolve("my-folder"));
+
+			// WHEN / THEN
+			assertThat(fileUtils.isFolderPresent(folder.toString())).isTrue();
+		}
+
+		@Test
+		@DisplayName("Should return false when folder does not exist")
+		void isFolderPresent_missingFolder_shouldReturnFalse() {
+			// GIVEN
+
+			// WHEN / THEN
+			assertThat(fileUtils.isFolderPresent(tempDir.resolve("missing").toString())).isFalse();
+		}
+	}
+
+	@Nested
+	@DisplayName("listFiles() tests")
+	class ListFilesTests {
+
+		@Test
+		@DisplayName("Should return names of files in the directory, excluding subdirectories")
+		void listFiles_shouldReturnFileNamesOnly() throws IOException {
+			// GIVEN
+			Path dir = Files.createDirectory(tempDir.resolve("dir"));
+			Files.createFile(dir.resolve("a.txt"));
+			Files.createFile(dir.resolve("b.xml"));
+			Files.createDirectory(dir.resolve("subdir"));
+
+			// WHEN
+			List<String> result = fileUtils.listFiles(dir.toString());
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("a.txt", "b.xml");
+		}
+
+		@Test
+		@DisplayName("Should return empty list when directory does not exist")
+		void listFiles_missingDirectory_shouldReturnEmptyList() {
+			// GIVEN
+
+			// WHEN
+			List<String> result = fileUtils.listFiles(tempDir.resolve("nonexistent").toString());
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+
+		@Test
+		@DisplayName("Should return empty list when directory is empty")
+		void listFiles_emptyDirectory_shouldReturnEmptyList() throws IOException {
+			// GIVEN
+			Path dir = Files.createDirectory(tempDir.resolve("empty"));
+
+			// WHEN
+			List<String> result = fileUtils.listFiles(dir.toString());
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("listFolders() tests")
+	class ListFoldersTests {
+
+		@Test
+		@DisplayName("Should return names of subdirectories only, excluding files")
+		void listFolders_shouldReturnSubdirectoryNamesOnly() throws IOException {
+			// GIVEN
+			Path dir = Files.createDirectory(tempDir.resolve("parent"));
+			Files.createDirectory(dir.resolve("sub1"));
+			Files.createDirectory(dir.resolve("sub2"));
+			Files.createFile(dir.resolve("file.txt"));
+
+			// WHEN
+			List<String> result = fileUtils.listFolders(dir.toString());
+
+			// THEN
+			assertThat(result).containsExactlyInAnyOrder("sub1", "sub2");
+		}
+
+		@Test
+		@DisplayName("Should return empty list when directory does not exist")
+		void listFolders_missingDirectory_shouldReturnEmptyList() {
+			// GIVEN
+
+			// WHEN
+			List<String> result = fileUtils.listFolders(tempDir.resolve("nonexistent").toString());
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+
+		@Test
+		@DisplayName("Should return empty list when directory contains no subdirectories")
+		void listFolders_noSubdirectories_shouldReturnEmptyList() throws IOException {
+			// GIVEN
+			Path dir = Files.createDirectory(tempDir.resolve("nosubdirs"));
+			Files.createFile(dir.resolve("file.txt"));
+
+			// WHEN
+			List<String> result = fileUtils.listFolders(dir.toString());
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("findFile() tests")
+	class FindFileTests {
+
+		@Test
+		@DisplayName("Should return the path of a file matching the regex")
+		void findFile_matchingFile_shouldReturnPath() throws IOException {
+			// GIVEN
+			Path dir = Files.createDirectory(tempDir.resolve("search"));
+			Path expected = Files.createFile(dir.resolve("data-2024.xml"));
+
+			// WHEN
+			Path result = fileUtils.findFile(dir.toString(), "data-.*\\.xml");
+
+			// THEN
+			assertThat(result).isEqualTo(expected);
+		}
+
+		@Test
+		@DisplayName("Should throw RuntimeException when no file matches the regex")
+		void findFile_noMatch_shouldThrowRuntimeException() throws IOException {
+			// GIVEN
+			Path dir = Files.createDirectory(tempDir.resolve("empty-search"));
+			String dirString = dir.toString();
+
+			// WHEN / THEN
+			assertThatThrownBy(() -> fileUtils.findFile(dirString, ".*\\.xml"))
+					.isInstanceOf(RuntimeException.class)
+					.hasMessageContaining("No file");
+		}
+
+		@Test
+		@DisplayName("Should match file name case-insensitively")
+		void findFile_shouldMatchCaseInsensitively() throws IOException {
+			// GIVEN
+			Path dir = Files.createDirectory(tempDir.resolve("case-search"));
+			Files.createFile(dir.resolve("DATA.XML"));
+
+			// WHEN
+			Path result = fileUtils.findFile(dir.toString(), "data\\.xml");
 
-	@Test
-	void getDataFolderTest() {
-		assertEquals(TestConstants.TEST_RESOURCES_DIRECTORY + "/IN/WEB/TEST",
-				fileUtils.getDataFolder("TEST", "WEB", null));
+			// THEN
+			assertThat(result.getFileName().toString()).isEqualToIgnoringCase("data.xml");
+		}
 	}
 
-	@Test
-	void getDoneFolderTest() {
-		assertEquals(TestConstants.TEST_RESOURCES_DIRECTORY + "/DONE/WEB/TEST",
-				fileUtils.getDoneFolder("TEST", "WEB"));
+	@Nested
+	@DisplayName("getDataFolder() tests")
+	class GetDataFolderTests {
+
+		@Test
+		@DisplayName("Should return IN/dataSource/campaign path when rootDataFolder is null")
+		void getDataFolder_nullRoot_shouldReturnInPath() {
+			// GIVEN
+
+			// WHEN
+			String result = fileUtils.getDataFolder("campaign", "WEB", null);
+
+			// THEN
+			assertThat(result).isEqualTo(tempDir + "/IN/WEB/campaign");
+		}
+
+		@Test
+		@DisplayName("Should append rootDataFolder to path when provided")
+		void getDataFolder_withRoot_shouldAppendRoot() {
+			// GIVEN
+
+			// WHEN
+			String result = fileUtils.getDataFolder("campaign", "WEB", "differential");
+
+			// THEN
+			assertThat(result).isEqualTo(tempDir + "/IN/WEB/campaign/differential");
+		}
+	}
+
+	@Nested
+	@DisplayName("getSpecFolder() tests")
+	class GetSpecFolderTests {
+
+		@Test
+		@DisplayName("Should return specFolderSource/specs")
+		void getSpecFolder_noArg_shouldReturnSpecsPath() {
+			// GIVEN
+
+			// WHEN
+			String result = fileUtils.getSpecFolder();
+
+			// THEN
+			assertThat(result).isEqualTo(tempDir + "/specs");
+		}
+
+		@Test
+		@DisplayName("Should return specFolderSource/specs/campaign when campaign is provided")
+		void getSpecFolder_withCampaign_shouldReturnCampaignSpecsPath() {
+			// GIVEN
+
+			// WHEN
+			String result = fileUtils.getSpecFolder("my-campaign");
+
+			// THEN
+			assertThat(result).isEqualTo(tempDir + "/specs/my-campaign");
+		}
+	}
+
+	@Nested
+	@DisplayName("getDoneFolder() tests")
+	class GetDoneFolderTests {
+
+		@Test
+		@DisplayName("Should return DONE/dataSource/campaign path")
+		void getDoneFolder_shouldReturnDonePath() {
+			// GIVEN
+
+			// WHEN
+			String result = fileUtils.getDoneFolder("campaign", "WEB");
+
+			// THEN
+			assertThat(result).isEqualTo(tempDir + "/DONE/WEB/campaign");
+		}
+	}
+
+	@Nested
+	@DisplayName("getKraftwerkOutFolder() tests")
+	class GetKraftwerkOutFolderTests {
+
+		@Test
+		@DisplayName("Should return out/campaign path")
+		void getKraftwerkOutFolder_shouldReturnOutPath() {
+			// GIVEN
+
+			// WHEN
+			String result = fileUtils.getKraftwerkOutFolder("campaign");
+
+			// THEN
+			assertThat(result).isEqualTo(tempDir + "/out/campaign");
+		}
 	}
 
-	@Test
-	void getSpecFolderTest(){
-		assertEquals(TestConstants.TEST_RESOURCES_DIRECTORY + "/specs",
-				fileUtils.getSpecFolder());
-		assertEquals(TestConstants.TEST_RESOURCES_DIRECTORY + "/specs/TEST",
-				fileUtils.getSpecFolder("TEST"));
+	@Nested
+	@DisplayName("getLogFolder() tests")
+	class GetLogFolderTests {
+
+		@Test
+		@DisplayName("Should return the configured log folder")
+		void getLogFolder_shouldReturnConfiguredValue() {
+			// GIVEN
+
+			// WHEN
+			String result = fileUtils.getLogFolder();
+
+			// THEN
+			assertThat(result).isEqualTo(tempDir.resolve("logs").toString());
+		}
 	}
 
-	@Test
-	void writeFileTest() throws IOException {
-		Path testFilePath = Path.of("test.txt");
+	@Nested
+	@DisplayName("writeFile() tests")
+	class WriteFileTests {
+
+		@Test
+		@DisplayName("Should create the file with the given content")
+		void writeFile_shouldCreateFileWithContent() {
+			// GIVEN
+			Path relativePath = Path.of("output", "result.txt");
+
+			// WHEN
+			fileUtils.writeFile(relativePath, "hello world");
+
+			// THEN
+			Path expectedPath = tempDir.resolve("output").resolve("result.txt");
+			assertThat(expectedPath).exists().hasContent("hello world");
+		}
+
+		@Test
+		@DisplayName("Should create parent directories if they do not exist")
+		void writeFile_shouldCreateParentDirectories() {
+			// GIVEN
+			Path relativePath = Path.of("deep", "nested", "dir", "file.txt");
+
+			// WHEN
+			fileUtils.writeFile(relativePath, "content");
 
-		fileUtils.writeFile(testFilePath,"test");
+			// THEN
+			assertThat(tempDir.resolve("deep").resolve("nested").resolve("dir")).isDirectory();
+		}
 
-		testFilePath = Path.of(TestConstants.TEST_RESOURCES_DIRECTORY,"test.txt");
+		@Test
+		@DisplayName("Should not overwrite an existing file")
+		void writeFile_existingFile_shouldNotOverwrite() throws IOException {
+			// GIVEN
+			Path relativePath = Path.of("existing.txt");
+			Path fullPath = tempDir.resolve("existing.txt");
+			Files.writeString(fullPath, "original");
 
-		Assertions.assertThat(testFilePath.toFile()).exists();
-		Assertions.assertThat(testFilePath.toFile()).hasContent("test");
+			// WHEN
+			fileUtils.writeFile(relativePath, "new content");
 
-		Files.deleteIfExists(testFilePath);
+			// THEN — file already existed, createNewFile returns false, so nothing is written
+			assertThat(fullPath).hasContent("original");
+		}
 	}
 
+	@Nested
+	@DisplayName("writeSuUpdatesInFile() tests")
+	class WriteSuUpdatesInFileTests {
+
+		@Test
+		@DisplayName("Should create the file and write a valid JSON array")
+		void writeSuUpdates_shouldWriteJsonArray() throws IOException {
+			// GIVEN
+			Path filePath = tempDir.resolve("updates").resolve("output.json");
+			Stream<SurveyUnitModel> stream = Stream.of(
+					SurveyUnitModel.builder().interrogationId("i1").build()
+			);
+
+			// WHEN
+			fileUtils.writeSuUpdatesInFile(filePath, stream);
+
+			// THEN
+			assertThat(filePath).exists();
+			String content = Files.readString(filePath);
+			assertThat(content).startsWith("[").endsWith("{}]");
+		}
+
+		@Test
+		@DisplayName("Should write an empty array when stream is empty")
+		void writeSuUpdates_emptyStream_shouldWriteEmptyArray() throws IOException {
+			// GIVEN
+			Path filePath = tempDir.resolve("updates").resolve("empty.json");
+
+			// WHEN
+			fileUtils.writeSuUpdatesInFile(filePath, Stream.empty());
+
+			// THEN
+			assertThat(Files.readString(filePath)).isEqualTo("[{}]");
+		}
+
+		@Test
+		@DisplayName("Should create parent directories if they do not exist")
+		void writeSuUpdates_shouldCreateParentDirectories() throws IOException {
+			// GIVEN
+			Path filePath = tempDir.resolve("deep").resolve("nested").resolve("out.json");
+
+			// WHEN
+			fileUtils.writeSuUpdatesInFile(filePath, Stream.empty());
+
+			// THEN
+			assertThat(filePath.getParent()).isDirectory();
+		}
+
+		@Test
+		@DisplayName("Should append to an existing file")
+		void writeSuUpdates_existingFile_shouldAppend() throws IOException {
+			// GIVEN
+			Path filePath = tempDir.resolve("append.json");
+			Files.writeString(filePath, "previous content\n");
+
+			// WHEN
+			fileUtils.writeSuUpdatesInFile(filePath, Stream.empty());
+
+			// THEN
+			String content = Files.readString(filePath);
+			assertThat(content).startsWith("previous content").endsWith("[{}]");
+		}
+	}
+
+	@Nested
+	@DisplayName("listAllSpecsFolders() tests")
+	class ListAllSpecsFoldersTests {
+
+		@Test
+		@DisplayName("Should return only subdirectories from the specs folder")
+		void listAllSpecsFolders_shouldReturnDirectoriesOnly() throws IOException {
+			// GIVEN
+			Path specsDir = Files.createDirectories(tempDir.resolve("specs"));
+			Files.createDirectory(specsDir.resolve("campaign-A"));
+			Files.createDirectory(specsDir.resolve("campaign-B"));
+			Files.createFile(specsDir.resolve("readme.txt"));
+
+			// WHEN
+			List<File> result = fileUtils.listAllSpecsFolders();
+
+			// THEN
+			assertThat(result)
+					.hasSize(2)
+					.allMatch(File::isDirectory)
+					.extracting(File::getName)
+					.containsExactlyInAnyOrder("campaign-A", "campaign-B");
+		}
+
+		@Test
+		@DisplayName("Should return empty list when specs folder is empty")
+		void listAllSpecsFolders_emptyFolder_shouldReturnEmptyList() throws IOException {
+			// GIVEN
+			Files.createDirectories(tempDir.resolve("specs"));
+
+			// WHEN
+			List<File> result = fileUtils.listAllSpecsFolders();
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+
+		@Test
+		@DisplayName("Should return empty list when specs folder does not exist")
+		void listAllSpecsFolders_missingFolder_shouldReturnEmptyList() {
+			// GIVEN — specs folder not created
+
+			// WHEN
+			List<File> result = fileUtils.listAllSpecsFolders();
+
+			// THEN
+			assertThat(result).isEmpty();
+		}
+	}
+
+	@Nested
+	@DisplayName("ensureContextualFolderExists() tests")
+	class EnsureContextualFolderExistsTests {
+
+		@Test
+		@DisplayName("Should create the contextual folder when it does not exist")
+		void ensureContextualFolder_missing_shouldCreateFolder() throws IOException {
+			// GIVEN
+			String questionnaireId = "questionnaire-123";
+			Mode mode = Mode.WEB;
+
+			// WHEN
+			fileUtils.ensureContextualFolderExists(questionnaireId, mode);
+
+			// THEN
+			String expectedPath = fileUtils.getDataFolder(questionnaireId, mode.getFolder(), null)
+					+ Constants.CONTEXTUAL_FOLDER;
+			assertThat(Path.of(expectedPath)).isDirectory();
+		}
+
+		@Test
+		@DisplayName("Should not throw when the contextual folder already exists")
+		void ensureContextualFolder_alreadyExists_shouldNotThrow() throws IOException {
+			// GIVEN
+			String questionnaireId = "questionnaire-123";
+			Mode mode = Mode.WEB;
+			String path = fileUtils.getDataFolder(questionnaireId, mode.getFolder(), null)
+					+ Constants.CONTEXTUAL_FOLDER;
+			Files.createDirectories(Path.of(path));
+
+			// WHEN / THEN
+			org.assertj.core.api.Assertions.assertThatCode(
+							() -> fileUtils.ensureContextualFolderExists(questionnaireId, mode))
+					.doesNotThrowAnyException();
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/infrastructure/utils/http/OidcServiceTest.java b/src/test/java/fr/insee/genesis/infrastructure/utils/http/OidcServiceTest.java
new file mode 100644
index 00000000..faa2d567
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/infrastructure/utils/http/OidcServiceTest.java
@@ -0,0 +1,289 @@
+package fr.insee.genesis.infrastructure.utils.http;
+
+import fr.insee.genesis.configuration.Config;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.*;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class OidcServiceTest {
+
+    private static final String AUTH_SERVER_URL = "https://auth.example.com";
+    private static final String REALM = "my-realm";
+    private static final String CLIENT_ID = "my-client";
+    private static final String CLIENT_SECRET = "my-secret";
+    private static final String EXPECTED_TOKEN_URL =
+            "https://auth.example.com/realms/my-realm/protocol/openid-connect/token";
+    private static final String VALID_TOKEN = "valid-access-token";
+    private static final String VALID_RESPONSE_BODY =
+            "{\"access_token\":\"valid-access-token\",\"expires_in\":300}";
+
+    @Mock
+    private Config config;
+
+    private OidcService oidcService;
+    private MockRestServiceServer mockServer;
+
+    @BeforeEach
+    void setUp() {
+        when(config.getAuthServerUrl()).thenReturn(AUTH_SERVER_URL);
+        when(config.getRealm()).thenReturn(REALM);
+        when(config.getServiceClientId()).thenReturn(CLIENT_ID);
+        when(config.getServiceClientSecret()).thenReturn(CLIENT_SECRET);
+
+        oidcService = new OidcService(config);
+
+        // Reading a final field via reflection works fine in Java 17+
+        // (only writing is blocked). We bind MockRestServiceServer to the
+        // internal RestTemplate to intercept HTTP calls without any code change.
+        RestTemplate internalRestTemplate =
+                (RestTemplate) ReflectionTestUtils.getField(oidcService, "restTemplate");
+        Assertions.assertThat(internalRestTemplate).isNotNull();
+        mockServer = MockRestServiceServer.createServer(internalRestTemplate);
+    }
+
+    @Nested
+    @DisplayName("retrieveServiceAccountToken() tests")
+    class RetrieveServiceAccountTokenTests {
+
+        @Test
+        @DisplayName("Should POST to the correct token URL")
+        void retrieveToken_shouldPostToCorrectUrl() throws IOException {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andExpect(method(HttpMethod.POST))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            // WHEN
+            oidcService.retrieveServiceAccountToken();
+
+            // THEN
+            mockServer.verify();
+        }
+
+        @Test
+        @DisplayName("Should set serviceAccountToken from response body")
+        void retrieveToken_shouldStoreToken() throws IOException {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            // WHEN
+            oidcService.retrieveServiceAccountToken();
+
+            // THEN
+            assertThat(ReflectionTestUtils.getField(oidcService, "serviceAccountToken"))
+                    .isEqualTo(VALID_TOKEN);
+        }
+
+        @Test
+        @DisplayName("Should set tokenExpirationTime in the future")
+        void retrieveToken_shouldSetExpirationTimeInFuture() throws IOException {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            long before = System.currentTimeMillis();
+
+            // WHEN
+            oidcService.retrieveServiceAccountToken();
+
+            // THEN
+            Long expirationTime = (Long) ReflectionTestUtils.getField(oidcService, "tokenExpirationTime");
+            assertThat(expirationTime).isGreaterThan(before);
+        }
+
+        @Test
+        @DisplayName("Should throw IOException when response is not 2xx")
+        void retrieveToken_non2xxResponse_shouldThrowIOException() {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withUnauthorizedRequest());
+
+            // WHEN / THEN
+            assertThatThrownBy(() -> oidcService.retrieveServiceAccountToken())
+                    .isInstanceOf(IOException.class);
+        }
+
+        @Test
+        @DisplayName("Should throw IOException when access_token is missing from response body")
+        void retrieveToken_missingAccessToken_shouldThrowIOException() {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withSuccess("{\"expires_in\":300}", MediaType.APPLICATION_JSON));
+
+            // WHEN / THEN
+            assertThatThrownBy(() -> oidcService.retrieveServiceAccountToken())
+                    .isInstanceOf(IOException.class)
+                    .hasMessageContaining("access_token");
+        }
+
+        @Test
+        @DisplayName("Should throw IOException when access_token is not a String")
+        void retrieveToken_accessTokenNotString_shouldThrowIOException() {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withSuccess(
+                            "{\"access_token\":12345,\"expires_in\":300}",
+                            MediaType.APPLICATION_JSON));
+
+            // WHEN / THEN
+            assertThatThrownBy(() -> oidcService.retrieveServiceAccountToken())
+                    .isInstanceOf(IOException.class)
+                    .hasMessageContaining("access_token");
+        }
+
+        @Test
+        @DisplayName("Should throw IOException on HTTP 4xx error")
+        void retrieveToken_httpClientError_shouldThrowIOException() {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withStatus(org.springframework.http.HttpStatus.FORBIDDEN));
+
+            // WHEN / THEN
+            assertThatThrownBy(() -> oidcService.retrieveServiceAccountToken())
+                    .isInstanceOf(IOException.class);
+        }
+
+        @Test
+        @DisplayName("Should send Content-Type: application/x-www-form-urlencoded")
+        void retrieveToken_shouldSendCorrectContentType() throws IOException {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andExpect(header("Content-Type", "application/x-www-form-urlencoded"))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            // WHEN
+            oidcService.retrieveServiceAccountToken();
+
+            // THEN
+            mockServer.verify();
+        }
+
+        @Test
+        @DisplayName("Should send client_id and client_secret in request body")
+        void retrieveToken_shouldSendCredentialsInBody() throws IOException {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andExpect(content().string(org.hamcrest.Matchers.containsString("client_id=" + CLIENT_ID)))
+                    .andExpect(content().string(org.hamcrest.Matchers.containsString("client_secret=" + CLIENT_SECRET)))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            // WHEN
+            oidcService.retrieveServiceAccountToken();
+
+            // THEN
+            mockServer.verify();
+        }
+    }
+
+    @Nested
+    @DisplayName("getServiceAccountToken() tests")
+    class GetServiceAccountTokenTests {
+
+        @Test
+        @DisplayName("Should fetch token when no token is cached")
+        void getToken_noTokenCached_shouldFetchAndReturnToken() throws IOException {
+            // GIVEN
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            // WHEN
+            String token = oidcService.getServiceAccountToken();
+
+            // THEN
+            mockServer.verify();
+            assertThat(token).isEqualTo(VALID_TOKEN);
+        }
+
+        @Test
+        @DisplayName("Should NOT fetch token when a valid token is cached")
+        void getToken_validTokenCached_shouldReturnCachedToken() throws IOException {
+            // GIVEN — inject a valid non-expired token directly
+            ReflectionTestUtils.setField(oidcService, "serviceAccountToken", VALID_TOKEN);
+            ReflectionTestUtils.setField(oidcService, "tokenExpirationTime",
+                    System.currentTimeMillis() + 60_000L);
+
+            // WHEN
+            String token = oidcService.getServiceAccountToken();
+
+            // THEN — no HTTP call should have been made
+            mockServer.verify();
+            assertThat(token).isEqualTo(VALID_TOKEN);
+        }
+
+        @Test
+        @DisplayName("Should re-fetch token when it is expired")
+        void getToken_expiredToken_shouldRefetch() throws IOException {
+            // GIVEN
+            ReflectionTestUtils.setField(oidcService, "serviceAccountToken", "old-token");
+            ReflectionTestUtils.setField(oidcService, "tokenExpirationTime",
+                    System.currentTimeMillis() - 1_000L);
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            // WHEN
+            String token = oidcService.getServiceAccountToken();
+
+            // THEN
+            mockServer.verify();
+            assertThat(token).isEqualTo(VALID_TOKEN);
+        }
+
+        @Test
+        @DisplayName("Should re-fetch token when within the 5-second expiry margin")
+        void getToken_tokenAboutToExpire_shouldRefetch() throws IOException {
+            // GIVEN — expires in 3 seconds, within the 5-second safety margin
+            ReflectionTestUtils.setField(oidcService, "serviceAccountToken", "soon-expired");
+            ReflectionTestUtils.setField(oidcService, "tokenExpirationTime",
+                    System.currentTimeMillis() + 3_000L);
+            mockServer.expect(requestTo(EXPECTED_TOKEN_URL))
+                    .andRespond(withSuccess(VALID_RESPONSE_BODY, MediaType.APPLICATION_JSON));
+
+            // WHEN
+            String token = oidcService.getServiceAccountToken();
+
+            // THEN
+            mockServer.verify();
+            assertThat(token).isEqualTo(VALID_TOKEN);
+        }
+    }
+
+    @Nested
+    @DisplayName("getConfig() tests")
+    class GetConfigTests {
+
+        @Test
+        @DisplayName("getConfig() should return the injected Config")
+        void getConfig_shouldReturnConfig() {
+            // GIVEN
+
+            // WHEN
+            Config result = oidcService.getConfig();
+
+            // THEN
+            assertThat(result).isEqualTo(config);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/fr/insee/genesis/stubs/RundeckExecutionApiPortStub.java b/src/test/java/fr/insee/genesis/stubs/RundeckExecutionApiPortStub.java
deleted file mode 100644
index 1293e8f0..00000000
--- a/src/test/java/fr/insee/genesis/stubs/RundeckExecutionApiPortStub.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package fr.insee.genesis.stubs;
-
-import fr.insee.genesis.domain.model.rundeck.RundeckExecution;
-import fr.insee.genesis.domain.ports.api.RundeckExecutionApiPort;
-import lombok.Setter;
-
-@Setter
-public class RundeckExecutionApiPortStub implements RundeckExecutionApiPort {
-
-    private boolean shouldThrowException = false;
-
-    @Override
-    public void addExecution(RundeckExecution rundeckExecution) {
-        if (shouldThrowException) {
-            throw new RuntimeException("Simulated exception");
-        }
-        // Otherwise, do nothing
-        System.out.println("Execution saved: " + rundeckExecution.getJob().getName());
-    }
-}