diff --git a/openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java b/openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java
index 51306a63a4..8788f92a95 100644
--- a/openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java
+++ b/openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java
@@ -473,8 +473,7 @@ private void setComputedAttributes(List<ExerciseSimple> originalExercises) {
     }
 
     Set<String> exerciseIds = getExerciseIds(exercises);
-    MappingsByExerciseIds mappingsByExerciseIds =
-        getResultsByExerciseIds(getExerciseIds(exercises));
+    MappingsByExerciseIds mappingsByExerciseIds = getResultsByExerciseIds(exerciseIds);
 
     Map<String, List<RawInjectExpectation>> expectationsByExerciseIds =
         getExpectationsByExerciseId(exerciseIds);
@@ -496,7 +495,7 @@ private void setComputedAttributesWithEmptyGlobalScore(List<ExerciseSimple> orig
         getResultsByExerciseIds(getExerciseIds(exercises));
 
     for (ExerciseSimple exercise : exercises) {
-      setEmptyGlobalScore(exercise);
+      exercise.setExpectationResultByTypes(new ArrayList<>());
 
       setTargets(exercise, mappingsByExerciseIds);
     }
@@ -558,10 +557,6 @@ private static void setGlobalScore(
             expectationsByExerciseIds.getOrDefault(exercise.getId(), emptyList())));
   }
 
-  private static void setEmptyGlobalScore(ExerciseSimple exercise) {
-    exercise.setExpectationResultByTypes(new ArrayList<>());
-  }
-
   private void setTargets(ExerciseSimple exercise, MappingsByExerciseIds mappingsByExerciseIds) {
     List<TargetSimple> allTargets =
         Stream.of(
diff --git a/openbas-api/src/test/java/io/openbas/rest/scenario/service/ScenarioStatisticServiceTest.java b/openbas-api/src/test/java/io/openbas/rest/scenario/service/ScenarioStatisticServiceTest.java
index a24380ddd1..8c75948659 100644
--- a/openbas-api/src/test/java/io/openbas/rest/scenario/service/ScenarioStatisticServiceTest.java
+++ b/openbas-api/src/test/java/io/openbas/rest/scenario/service/ScenarioStatisticServiceTest.java
@@ -23,9 +23,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
 @ExtendWith(MockitoExtension.class)
 class ScenarioStatisticServiceTest {
   @Mock private ExerciseRepository exerciseRepository;
diff --git a/openbas-api/src/test/java/io/openbas/utils/ResultUtilsTest.java b/openbas-api/src/test/java/io/openbas/utils/ResultUtilsTest.java
index 1813730c5b..d8adf61653 100644
--- a/openbas-api/src/test/java/io/openbas/utils/ResultUtilsTest.java
+++ b/openbas-api/src/test/java/io/openbas/utils/ResultUtilsTest.java
@@ -18,9 +18,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
 @ExtendWith(MockitoExtension.class)
 class ResultUtilsTest {
   @Mock private InjectExpectationRepository injectExpectationRepository;