diff --git a/test/unit/game/GameStateTest.cpp b/test/unit/game/GameStateTest.cpp
index bb955fc..553ee5f 100644
--- a/test/unit/game/GameStateTest.cpp
+++ b/test/unit/game/GameStateTest.cpp
@@ -115,10 +115,6 @@ TEST(game_state_test, game_state_test_2)
     }
 
     while (true) {
-        if (serverGameState.getCurrentPlayer()->getRemainingCardCount() == 0) {
-            break;
-        }
-
         for (auto it = serverGameState.getCurrentPlayer()->getCards().begin();; it++) {
             const auto player = serverGameState.getCurrentPlayer();
             auto prevCards    = player->getCards();
@@ -140,7 +136,8 @@ TEST(game_state_test, game_state_test_2)
 
                 break;
             }
-            if (it->canBePlayedOn(serverGameState.getDiscardPile().getFront())) {
+
+            if (it->canBePlayedOn(serverGameState.getDiscardPile().getFront(), serverGameState.getDrawCount())) {
                 auto card        = *it;
                 size_t prevCount = player->getCards().count(card);
 
@@ -159,5 +156,11 @@ TEST(game_state_test, game_state_test_2)
                 break;
             }
         }
+
+        ASSERT_EQ(serverGameState.getCurrentPlayer()->getRemainingCardCount(), serverGameState.getCurrentPlayer()->getCards().size());
+
+        if (serverGameState.getCurrentPlayer()->getRemainingCardCount() == 0) {
+            break;
+        }
     }
 }
\ No newline at end of file