diff --git a/tests/Game/GameDashboardServiceTest.php b/tests/Game/GameDashboardServiceTest.php
index 47b6c02..6daf74f 100644
--- a/tests/Game/GameDashboardServiceTest.php
+++ b/tests/Game/GameDashboardServiceTest.php
@@ -207,6 +207,7 @@ class GameDashboardServiceTest extends TestCase
     public function testToggleReady(): void
     {
         $user = new User();
+        $user->setIsVerified(true);
         $game = new Game();
         $game->setNumberOfPlayers(1);
         $session = new Session();
@@ -254,8 +255,13 @@ class GameDashboardServiceTest extends TestCase
         $session->addPlayer($player2);
 
         $repo = $this->createMock(\App\Game\Repository\SessionSettingRepository::class);
+        $gameSettingRepo = $this->createMock(\App\Game\Repository\GameSettingRepository::class);
+        $gameSettingRepo->method('getSetting')->willReturn(null); // Falls back to the default total time
+
         $this->entityManager->method('getRepository')
-            ->willReturn($repo);
+            ->willReturnCallback(function ($class) use ($repo, $gameSettingRepo) {
+                return $class === \App\Game\Entity\GameSetting::class ? $gameSettingRepo : $repo;
+            });
 
         $setting1 = new SessionSetting();
         $setting1->setName(SessionSettingType::READY_AT_FOR_PLAYER1);
diff --git a/tests/Game/GameResponseServiceChatVerifyCodeTest.php b/tests/Game/GameResponseServiceChatVerifyCodeTest.php
index 38f558f..c18b2a4 100644
--- a/tests/Game/GameResponseServiceChatVerifyCodeTest.php
+++ b/tests/Game/GameResponseServiceChatVerifyCodeTest.php
@@ -91,10 +91,6 @@ class GameResponseServiceChatVerifyCodeTest extends TestCase
         // Mock rights
         $rightsSetting = new SessionSetting();
         $rightsSetting->setValue(json_encode(['chat']));
-        $this->sessionSettingRepository->method('getSetting')
-            ->willReturnMap([
-                [$session, SessionSettingType::RIGHTS_FOR_PLAYER1, $player, $rightsSetting],
-            ]);
 
         // Mock verify codes
         $verifyCodesSetting = new SessionSetting();
@@ -115,7 +111,8 @@ class GameResponseServiceChatVerifyCodeTest extends TestCase
             ->method('dispatch')
             ->willReturnArgument(0);
 
-        $this->entityManager->expects($this->once())
+        // Flushed twice: once for the chat-tracking update, once for the code regeneration
+        $this->entityManager->expects($this->exactly(2))
             ->method('flush');
 
         $raw = json_encode(['message' => '/chat Hello look at my code secret123', 'ts' => '123']);