diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java
index 57c19de5..612e0d73 100644
--- a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java
+++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java
@@ -308,7 +308,7 @@ public void testClientGameToCeremony() {
         clientGameLogic.received(lobbyPlayerLeave);
         clientGameLogic.received(moveMessage);
         clientGameLogic.received(noTurn);
-        clientGameLogic.received(interruptMessage);
+        //clientGameLogic.received(interruptMessage);
         clientGameLogic.received(playCardSwap);
         clientGameLogic.received(playCardShield);
         clientGameLogic.received(playCardTurbo);
@@ -968,7 +968,7 @@ public void testStayInPlayPowerCard() {
         clientGameLogic.received(lobbyPlayerLeave);
         clientGameLogic.received(moveMessage);
         clientGameLogic.received(noTurn);
-        clientGameLogic.received(interruptMessage);
+        //clientGameLogic.received(interruptMessage);
         clientGameLogic.received(playCardSwap);
         clientGameLogic.received(playCardShield);
         clientGameLogic.received(playCardTurbo);
@@ -1023,7 +1023,7 @@ public void testPlayPowerCardToRollDice() {
         clientGameLogic.received(lobbyPlayerLeave);
         clientGameLogic.received(moveMessage);
         clientGameLogic.received(noTurn);
-        clientGameLogic.received(interruptMessage);
+        //clientGameLogic.received(interruptMessage);
         clientGameLogic.received(playCardSwap);
         clientGameLogic.received(playCardShield);
         clientGameLogic.received(playCardTurbo);
@@ -1086,7 +1086,7 @@ public void testStayInRollDice() {
         clientGameLogic.received(lobbyPlayerLeave);
         clientGameLogic.received(moveMessage);
         //clientGameLogic.received(noTurn);
-        clientGameLogic.received(interruptMessage);
+        //clientGameLogic.received(interruptMessage);
         clientGameLogic.received(playCardSwap);
         clientGameLogic.received(playCardShield);
         clientGameLogic.received(playCardTurbo);
@@ -1770,7 +1770,7 @@ public void testStayInStartPiece() {
     }
 
     /**
-     * UC-ClientState-57: Test the StartPiece to ChoosePiece end state.
+     * UC-ClientState-57: Test the StartPiece to ChoosePiece-end-state.
      */
     @Test
     public void testStartPieceToChoosePieceEndState() {
@@ -1790,8 +1790,48 @@ public void testStartPieceToChoosePieceEndState() {
         choosePiece.setState(startPiece);
         assertEquals(choosePiece.getState(), startPiece);
 
-        //Todo send the message which force a state change
+        //send the message that don't indicate a statechange
+        clientGameLogic.received(activePlayer);
+        clientGameLogic.received(anyPiece);
+        clientGameLogic.received(briefing);
+        clientGameLogic.received(ceremonyMessage);
+        clientGameLogic.received(die);
+        clientGameLogic.received(diceAgain);
+        clientGameLogic.received(diceNow);
+        clientGameLogic.received(endOfTurn);
+        clientGameLogic.received(lobbyAccept);
+        clientGameLogic.received(lobbyDeny);
+        clientGameLogic.received(lobbyPlayerJoin);
+        clientGameLogic.received(lobbyPlayerLeave);
+        //clientGameLogic.received(moveMessage);
+        clientGameLogic.received(noTurn);
+        //clientGameLogic.received(interruptMessage);
+        clientGameLogic.received(playCardSwap);
+        clientGameLogic.received(playCardShield);
+        clientGameLogic.received(playCardTurbo);
+        clientGameLogic.received(possibleCard);
+        clientGameLogic.received(possiblePiece);
+        clientGameLogic.received(rankingResponce);
+        clientGameLogic.received(rankingRollAgain);
+        clientGameLogic.received(reconnectBriefing);
+        clientGameLogic.received(resumeGame);
+        clientGameLogic.received(startGame);
+        clientGameLogic.received(startPieceMessage);
+        clientGameLogic.received(updateReady);
+        clientGameLogic.received(updateTSK);
+        clientGameLogic.received(waitPiece);
+        clientGameLogic.received(spectatorMessage);
 
+        //tests if the client ist still in StartPiece
+        assertEquals(clientGameLogic.getState(), gameState);
+        assertEquals(gameState.getState(), turnState);
+        assertEquals(turnState.getState(), choosePiece);
+        assertEquals(choosePiece.getState(), startPiece);
+
+        //send MovePieceMessage
+        clientGameLogic.received(moveMessage);
+
+        //tests if the client is in the movePiece-state
         assertEquals(clientGameLogic.getState(), gameState);
         assertEquals(gameState.getState(), turnState);
         assertEquals(turnState.getState(), movePiece);
@@ -1829,7 +1869,7 @@ public void testRollRankingDiceToWaitRanking() {
         clientGameLogic.received(lobbyPlayerLeave);
         clientGameLogic.received(moveMessage);
         clientGameLogic.received(noTurn);
-        clientGameLogic.received(interruptMessage);
+        //clientGameLogic.received(interruptMessage);
         clientGameLogic.received(playCardSwap);
         clientGameLogic.received(playCardShield);
         clientGameLogic.received(playCardTurbo);
@@ -1892,7 +1932,7 @@ public void testWaitRankingToRollRankingDice() {
         clientGameLogic.received(lobbyPlayerLeave);
         clientGameLogic.received(moveMessage);
         clientGameLogic.received(noTurn);
-        clientGameLogic.received(interruptMessage);
+        //clientGameLogic.received(interruptMessage);
         clientGameLogic.received(playCardSwap);
         clientGameLogic.received(playCardShield);
         clientGameLogic.received(playCardTurbo);
@@ -1955,7 +1995,7 @@ public void testWaitRankingToEndStateDetermineStartingPlayer() {
         clientGameLogic.received(lobbyPlayerLeave);
         clientGameLogic.received(moveMessage);
         clientGameLogic.received(noTurn);
-        clientGameLogic.received(interruptMessage);
+        //clientGameLogic.received(interruptMessage);
         clientGameLogic.received(playCardSwap);
         clientGameLogic.received(playCardShield);
         clientGameLogic.received(playCardTurbo);