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 96fd2f57..2e943d98 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
@@ -67,7 +67,7 @@ public class ClientStateTest {
     private ActivePlayer activePlayer;
     private AnyPiece anyPiece;
     private Briefing briefing;
-    private Ceremony ceremonyMessage;
+    private CeremonyMessage ceremonyMessage;
     private Dice dice;
     private DiceAgain diceAgain;
     private DiceNow diceNow;
@@ -82,7 +82,7 @@ public class ClientStateTest {
     private PlayCard playCard;
     private PossibleCard possibleCard;
     private PossiblePiece possiblePiece;
-    private RankingResponce rankingResponce;
+    private RankingResponse rankingResponce;
     private RankingRollAgain rankingRollAgain;
     private ReconnectBriefing reconnectBriefing;
     private ResumeGame resumeGame;
@@ -100,7 +100,7 @@ public void setUp() {
         activePlayer = new ActivePlayer();
         anyPiece = new AnyPiece();
         briefing = new Briefing();
-        ceremonyMessage = new Ceremony();
+        ceremonyMessage = new CeremonyMessage();
         dice = new Dice();
         diceAgain = new DiceAgain();
         diceNow = new DiceNow();
@@ -115,7 +115,7 @@ public void setUp() {
         playCard = new PlayCard();
         possibleCard = new PossibleCard();
         possiblePiece = new PossiblePiece();
-        rankingResponce = new RankingResponce();
+        rankingResponce = new RankingResponse();
         rankingRollAgain = new RankingRollAgain();
         reconnectBriefing = new ReconnectBriefing();
         resumeGame = new ResumeGame();
@@ -137,13 +137,13 @@ public void setUp() {
 
         //initialize the stateMachines
         ceremonyStateMachine =ceremony.getCeremonyStateMachine();
-        choosePieceStateMachine = choosePiece.getChoosePieceMachine();
-        determineStartPlayerStateMachine = determineStartPlayer.getDetermineStartPlayerMachine();
+        choosePieceStateMachine = choosePiece.getChoosePieceStateMachine();
+        determineStartPlayerStateMachine = determineStartPlayer.getDetermineStartPlayerStateMachine();
         dialogsStateMachine = dialogs.getDialogsStateMachine();
         gameStateMachine = gameState.getGameStateMachine();
-        powerCardStateMachine = powerCard.getPowerCardMachine();
+        powerCardStateMachine = powerCard.getPowerCardStateMachine();
         settingsStateMachine = settings.getSettingsStateMachine();
-        turnStateMachine = turn.getTurnMachine();
+        turnStateMachine = turn.getTurnStateMachine();
 
 
         //initialize the states
@@ -213,14 +213,14 @@ public void testDialogsToGame() {
         assertTrue(clientAutomaton.getState() instanceof GameState);
 
         //tests if the new State of the GameStateMachine is in DetermineStartPlayer
-        GameState gameState1 = clientAutomaton.getState();
+        GameState gameState1 = (GameState) clientAutomaton.getState();
         GameStateMachine gameStateMachine1 = gameState1.getGameStateMachine();
         assertTrue(gameStateMachine1.getState() instanceof DetermineStartPlayer);
 
         //tests if the new State of DetermineStartPlayer is RollRankingDice
         DetermineStartPlayer determineStartPlayer1=(DetermineStartPlayer) gameStateMachine1.getState();
         DetermineStartPlayerStateMachine determineStartPlayerStateMachine1 = determineStartPlayer1.getDetermineStartPlayerStateMachine();
-        assertTrue(DetermineStartPlayerStateMachine.getState() instanceof RollRankingDice);
+        assertTrue(determineStartPlayerStateMachine1.getState() instanceof RollRankingDice);
     }
 
     /**
@@ -547,12 +547,12 @@ public void testLobbyToRollRankingDice() {
 
         //tests if the clientStateMachine is in the DetermineStartPlayer
         GameState gameState1 = (GameState) clientAutomaton.getState();
-        GameStateMachine gameStateMachine1 = gameState1.getgameSatateMachine();
+        GameStateMachine gameStateMachine1 = gameState1.getGameSatateMachine();
         assertTrue(gameStateMachine1.getState() instanceof DetermineStartPlayer);
 
         //tests if the clientStateMachine is in the RollRankingDice
         DetermineStartPlayer determineStartPlayer1 = (DetermineStartPlayer) gameStateMachine1.getState();
-        DetermineStartPlayerStateMachine determineStartPlayerStateMachine1 = gameStateMachine1.getDetermineStartPlayerMachine();
+        DetermineStartPlayerStateMachine determineStartPlayerStateMachine1 = determineStartPlayer1.getDetermineStartPlayerStateMachine();
         assertTrue(determineStartPlayerStateMachine1.getState() instanceof RollRankingDice);
     }
 
@@ -617,7 +617,7 @@ public void testWaitToTurn() {
 
         //sends the gameStateMachine in the Turn
         GameStateMachine gameStateMachine1 = gameState.getGameStateMachine();
-        gameStateMachine1.gotoState(wait);
+        gameStateMachine1.gotoState(waiting);
         assertTrue(gameStateMachine1.getState() instanceof Turn);
 
         //the client receives the message ActivePlayer