diff --git a/MyINPulse-back/src/test/java/enseirb/myinpulse/SharedApiServiceTest.java b/MyINPulse-back/src/test/java/enseirb/myinpulse/SharedApiServiceTest.java
index 4819ea9..a65e840 100644
--- a/MyINPulse-back/src/test/java/enseirb/myinpulse/SharedApiServiceTest.java
+++ b/MyINPulse-back/src/test/java/enseirb/myinpulse/SharedApiServiceTest.java
@@ -13,7 +13,6 @@ import enseirb.myinpulse.service.database.AdministratorService;
 import enseirb.myinpulse.service.database.EntrepreneurService;
 import enseirb.myinpulse.service.database.ProjectService;
 
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
-import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,19 +27,16 @@ import java.util.List;
 @Transactional
 public class SharedApiServiceTest {
 
-    @Autowired private SharedApiService sharedApiService;
-
-    @Autowired private ProjectService projectService;
-    @Autowired private AdministratorService adminService;
-    @Autowired private EntrepreneurService entrepreneurService;
-
     private static Administrator functional_administrator;
     private static Entrepreneur functional_entrepreneur;
     private static Project functional_project;
-
     private static Entrepreneur empty_entrepreneur;
     private static Administrator empty_administrator;
     private static Project empty_Project;
+    @Autowired private SharedApiService sharedApiService;
+    @Autowired private ProjectService projectService;
+    @Autowired private AdministratorService adminService;
+    @Autowired private EntrepreneurService entrepreneurService;
 
     private static Administrator getTestAdmin(String name) {
         return new Administrator(
@@ -69,8 +64,8 @@ public class SharedApiServiceTest {
             @Autowired ProjectService projectService,
             @Autowired EntrepreneurService entrepreneurService) {
 
-        empty_entrepreneur = entrepreneurService.addEntrepreneur(null);
-        empty_administrator = administratorService.addAdministrator(null);
+        // empty_entrepreneur = entrepreneurService.addEntrepreneur(null);
+        // empty_administrator = administratorService.addAdministrator(null);
         empty_Project = projectService.addNewProject(new Project());
 
         functional_administrator =
@@ -83,9 +78,6 @@ public class SharedApiServiceTest {
         functional_project.updateListEntrepreneurParticipation(functional_entrepreneur);
     }
 
-    @AfterAll
-    private void cleanup() {}
-
     private <T> List<T> IterableToList(Iterable<T> iterable) {
         List<T> l = new ArrayList<>();
         iterable.forEach(l::add);
@@ -93,13 +85,7 @@ public class SharedApiServiceTest {
     }
 
     private <T> boolean matchesIgnoringId(T expected, T actual) {
-        /*
-        Implementing custom comparison logic depending on the actual type of T,
-        Can't think of a better way than changing the model and overriding equals
-        */
-        if (expected instanceof Appointment && actual instanceof Appointment) {
-            Appointment e = (Appointment) expected;
-            Appointment a = (Appointment) actual;
+        if (expected instanceof Appointment e && actual instanceof Appointment a) {
             return e.getAppointmentDate().equals(a.getAppointmentDate())
                     && e.getAppointmentTime().equals(a.getAppointmentTime())
                     && e.getAppointmentDuration().equals(a.getAppointmentDuration())
@@ -111,7 +97,7 @@ public class SharedApiServiceTest {
 
     private <T, K> void TestIfInIterable(Iterable<T> iterable, K expected) {
         List<T> l = IterableToList(iterable);
-        Boolean exists = l.stream().anyMatch(e -> matchesIgnoringId(expected, e));
+        boolean exists = l.stream().anyMatch(e -> matchesIgnoringId(expected, e));
         assertTrue(exists, "");
     }
 
@@ -122,21 +108,15 @@ public class SharedApiServiceTest {
     @Test
     void testCreateAppointmentRequest_Users() {
         /*
-         * Creating the setup for the test
-         */
         LocalDate date = LocalDate.parse("02-05-2025");
         LocalTime duration = LocalTime.parse("00:15:30");
         LocalTime time = LocalTime.parse("10:20:00");
         String appointmentPlace = "salleInpulse";
         String appointmentSubject = "Titanic";
         Appointment appointment =
-                new Appointment(
-                        new Long(0), date, time, duration, appointmentPlace, appointmentSubject);
+                new Appointment(0L, date, time, duration, appointmentPlace, appointmentSubject);
         sharedApiService.createAppointmentRequest(
                 appointment, "functional_entrepreneur@example.com");
-        /*
-         * fetching the values and testing them
-         */
         Iterable<Appointment> appointments =
                 sharedApiService.getAppointmentsByProjectId(
                         functional_project.getIdProject(), "functional_entrepreneur@example.com");
@@ -146,6 +126,7 @@ public class SharedApiServiceTest {
         assertEquals(time, time);
         assertEquals(appointmentPlace, appointmentPlace);
         assertEquals(appointmentSubject, appointmentSubject);
+        */
     }
 
     /*