diff --git a/core/src/test/java/group07/beatbattle/firebase/FakeFirebaseGateway.java b/core/src/test/java/group07/beatbattle/firebase/FakeFirebaseGateway.java
index e681b28..f93bb95 100644
--- a/core/src/test/java/group07/beatbattle/firebase/FakeFirebaseGateway.java
+++ b/core/src/test/java/group07/beatbattle/firebase/FakeFirebaseGateway.java
@@ -244,11 +244,18 @@ public void listenToRoundAnswerCount(String sessionId, int roundIndex,
 
     @Override
     public void clearAnswers(String sessionId, SimpleCallback callback) {
-        Map<String, Map<String, Boolean>> sessionAnswers = answers.get(sessionId);
+        Map<Integer, Set<String>> sessionAnswers = answers.get(sessionId);
         if (sessionAnswers != null) sessionAnswers.clear();
         callback.onSuccess();
     }
 
+    @Override
+    public void stopAllListeners() {
+        playerListeners.clear();
+        stateListeners.clear();
+        answerCountListeners.clear();
+    }
+
     // =========================================================================
     // Internal helpers
     // =========================================================================