diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/AddParticipantTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/AddParticipantTests.java
index 22a461b..de0b7f5 100644
--- a/fagiServer/src/test/java/com/fagi/handler/inputhandler/AddParticipantTests.java
+++ b/fagiServer/src/test/java/com/fagi/handler/inputhandler/AddParticipantTests.java
@@ -11,9 +11,7 @@
 import com.fagi.responses.UserExists;
 import com.fagi.worker.OutputAgent;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Optional;
 
@@ -24,7 +22,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 public class AddParticipantTests extends BaseInputHandlerTest {
     private static final String SENDER_USERNAME = "sender username";
     private static User newParticipant;
diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/CreateConversationTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/CreateConversationTests.java
index 8e7422b..02dfd7d 100644
--- a/fagiServer/src/test/java/com/fagi/handler/inputhandler/CreateConversationTests.java
+++ b/fagiServer/src/test/java/com/fagi/handler/inputhandler/CreateConversationTests.java
@@ -9,10 +9,8 @@
 import com.fagi.worker.OutputAgent;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -24,7 +22,6 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 
-@ExtendWith(MockitoExtension.class)
 public class CreateConversationTests extends BaseInputHandlerTest {
 
     void beforeEach() {
diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendRequestTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendRequestTests.java
index a421b47..dbb6bad 100644
--- a/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendRequestTests.java
+++ b/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendRequestTests.java
@@ -5,9 +5,7 @@
 import com.fagi.responses.AllIsWell;
 import com.fagi.util.OutputAgentTestUtil;
 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.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -17,7 +15,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 public class DeleteFriendRequestTests extends BaseInputHandlerTest {
     private User user;
 
diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendTests.java
index 16ae4de..99b49a8 100644
--- a/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendTests.java
+++ b/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendTests.java
@@ -5,9 +5,7 @@
 import com.fagi.responses.AllIsWell;
 import com.fagi.util.OutputAgentTestUtil;
 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.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -17,7 +15,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 public class DeleteFriendTests extends BaseInputHandlerTest {
     private User user;
 
diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/FriendRequestServerTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/FriendRequestServerTests.java
index 7f03598..ba1f7bb 100644
--- a/fagiServer/src/test/java/com/fagi/handler/inputhandler/FriendRequestServerTests.java
+++ b/fagiServer/src/test/java/com/fagi/handler/inputhandler/FriendRequestServerTests.java
@@ -13,10 +13,8 @@
 import com.fagi.worker.InputAgent;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Collections;
 import java.util.List;
@@ -27,7 +25,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(MockitoExtension.class)
 class FriendRequestServerTests extends BaseInputHandlerTest {
     private User user;
 
diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/GetFriendListRequestTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/GetFriendListRequestTests.java
index 468627c..b60561f 100644
--- a/fagiServer/src/test/java/com/fagi/handler/inputhandler/GetFriendListRequestTests.java
+++ b/fagiServer/src/test/java/com/fagi/handler/inputhandler/GetFriendListRequestTests.java
@@ -5,11 +5,9 @@
 import com.fagi.model.User;
 import com.fagi.model.messages.lists.FriendList;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +24,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 class GetFriendListRequestTests extends BaseInputHandlerTest {
     @Captor private ArgumentCaptor<FriendList> friendListArgumentCaptor;
     private final List<String> friendsUsernames = new ArrayList<>();
diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/SessionTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/SessionTests.java
index 9c62b94..139116c 100644
--- a/fagiServer/src/test/java/com/fagi/handler/inputhandler/SessionTests.java
+++ b/fagiServer/src/test/java/com/fagi/handler/inputhandler/SessionTests.java
@@ -5,9 +5,7 @@
 import com.fagi.model.Session;
 import com.fagi.responses.AllIsWell;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -16,7 +14,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 public class SessionTests extends BaseInputHandlerTest {
     private Session session;