diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java
index 67aaae4..e12d0d9 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java
@@ -13,7 +13,7 @@ class LobbyButtonGridManagerTest {
     @BeforeEach
     void setUp() {
         gridPane = new GridPane();
-        translationManager = new LobbyButtonTranslationManager();
+        translationManager = LobbyButtonTranslationManager.getInstance();
         translationManager.getButtonIdToLobbyId().clear();
         gridManager = new LobbyButtonGridManager(gridPane, translationManager);
     }
@@ -24,9 +24,4 @@ class LobbyButtonGridManagerTest {
         assertTrue(lobbyId > 0);
     }
 
-    @Test
-    void testJoinLobbyPlaceholder() {
-        // check if exception is thrown
-        assertDoesNotThrow(() -> gridManager.joinLobby(123));
-    }
 }
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonTranslationManagerTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonTranslationManagerTest.java
index d19532a..dfcce6a 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonTranslationManagerTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonTranslationManagerTest.java
@@ -6,11 +6,12 @@ import java.util.Map;
 import org.junit.jupiter.api.*;
 
 class LobbyButtonTranslationManagerTest {
+
     LobbyButtonTranslationManager manager;
 
     @BeforeEach
     void setUp() {
-        manager = new LobbyButtonTranslationManager();
+        manager = LobbyButtonTranslationManager.getInstance();
         manager.getButtonIdToLobbyId().clear();
     }