diff --git a/tests/src/de/pokerth/test/ChatTest.java b/tests/src/de/pokerth/test/ChatTest.java
index df744e69..e289b7a6 100644
--- a/tests/src/de/pokerth/test/ChatTest.java
+++ b/tests/src/de/pokerth/test/ChatTest.java
@@ -208,7 +208,7 @@ public class ChatTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
 
 		// Acknowledge start event.
 		StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
@@ -236,7 +236,7 @@ public class ChatTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage());
 
 		// Guest user: not allowed.
 		msg = createGameChatMsg(ChatText + 7, gameId);
@@ -245,7 +245,7 @@ public class ChatTest extends TestBase {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
 			assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage());
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage());
 		assertEquals(ChatText + 7, msg.getGameMessage().getGameManagementMessage().getChatRejectMessage().getChatText());
 
 		// Other users: allowed.
@@ -256,7 +256,7 @@ public class ChatTest extends TestBase {
 				msg = receiveMessage(s[c]);
 				failOnErrorMessage(msg);
 				assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage());
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasChatMessage());
 	
 			assertEquals(ChatText + "c" + c, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatText());
 			assertEquals(ChatType.chatTypeStandard, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatType());
@@ -269,7 +269,7 @@ public class ChatTest extends TestBase {
 						msg = receiveMessage(s[i]);
 						failOnErrorMessage(msg);
 						assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage());
-					} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage()));
+					} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasChatMessage());
 					assertEquals(ChatText + "c" + c, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatText());
 					assertEquals(ChatType.chatTypeStandard, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatType());
 					assertEquals(playerId[c], msg.getGameMessage().getGameManagementMessage().getChatMessage().getPlayerId());
@@ -285,7 +285,7 @@ public class ChatTest extends TestBase {
 			msg = receiveMessage(s[0]);
 			failOnErrorMessage(msg);
 			assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage());
-		} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasChatRejectMessage()));
+		} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasChatRejectMessage());
 
 		// Leave the game.
 		msg = leaveGameRequestMsg(gameId);
@@ -293,7 +293,7 @@ public class ChatTest extends TestBase {
 		do {
 			msg = receiveMessage(s[0]);
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasRemovedFromGameMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasRemovedFromGameMessage());
 		// A game chat message, if not within a game, should be rejected with error.
 		msg = createGameChatMsg(ChatText + 9, gameId);
 		sendMessage(msg, s[0]);
diff --git a/tests/src/de/pokerth/test/GameListTest.java b/tests/src/de/pokerth/test/GameListTest.java
index 1abd51a5..4d60fc52 100644
--- a/tests/src/de/pokerth/test/GameListTest.java
+++ b/tests/src/de/pokerth/test/GameListTest.java
@@ -162,7 +162,7 @@ public class GameListTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage()));
+		} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage());
 
 		assertEquals(NetGameMode.netGameStarted, msg.getLobbyMessage().getGameListUpdateMessage().getGameMode());
 
@@ -172,7 +172,7 @@ public class GameListTest extends TestBase {
 			do {
 				msg = receiveMessage();
 				failOnErrorMessage(msg);
-			} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerLeftMessage()));
+			} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerLeftMessage());
 			GameListPlayerLeftMessage gameListLeftMsg = msg.getLobbyMessage().getGameListPlayerLeftMessage();
 			assertEquals(gameId, gameListLeftMsg.getGameId());
 			assertEquals(playerId[i], gameListLeftMsg.getPlayerId());
@@ -182,7 +182,7 @@ public class GameListTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage()));
+		} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage());
 
 		assertEquals(NetGameMode.netGameClosed, msg.getLobbyMessage().getGameListUpdateMessage().getGameMode());
 	}
diff --git a/tests/src/de/pokerth/test/LoadTest.java b/tests/src/de/pokerth/test/LoadTest.java
index 1e04c92f..1ec72ae4 100644
--- a/tests/src/de/pokerth/test/LoadTest.java
+++ b/tests/src/de/pokerth/test/LoadTest.java
@@ -67,7 +67,7 @@ public class LoadTest extends TestBase {
 				msg = receiveMessage(s[i * 10]);
 			} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
 				|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -88,7 +88,7 @@ public class LoadTest extends TestBase {
 			} while (msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage() || msg.getLobbyMessage().hasPlayerListMessage()));
 
 			// Join game ack.
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 				failOnErrorMessage(msg);
 				fail("Could not create game!");
 			}
@@ -110,7 +110,7 @@ public class LoadTest extends TestBase {
 				msg = receiveMessage(s[i]);
 			} while ((msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())
 				|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -119,7 +119,7 @@ public class LoadTest extends TestBase {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
 			} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage()) && !(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameFailedMessage()));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 				fail("User " + username + " could not join normal game.");
 			}
 		}
diff --git a/tests/src/de/pokerth/test/LobbySubscriptionTest.java b/tests/src/de/pokerth/test/LobbySubscriptionTest.java
index 3ba41cdc..cc236ebd 100644
--- a/tests/src/de/pokerth/test/LobbySubscriptionTest.java
+++ b/tests/src/de/pokerth/test/LobbySubscriptionTest.java
@@ -45,7 +45,7 @@ public class LobbySubscriptionTest extends TestBase {
 		final int requestId = 1234;
 		PokerTHMessage msg;
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -99,7 +99,7 @@ public class LobbySubscriptionTest extends TestBase {
 			if (msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasPlayerListMessage())) {
 				fail("Game/player list messages are switched off!");
 			}
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
 
 		// Resubscribe game list
 		subscriptionRequest = SubscriptionRequestMessage.newBuilder()
diff --git a/tests/src/de/pokerth/test/RejoinGameTest.java b/tests/src/de/pokerth/test/RejoinGameTest.java
index d56757b3..2cedc577 100644
--- a/tests/src/de/pokerth/test/RejoinGameTest.java
+++ b/tests/src/de/pokerth/test/RejoinGameTest.java
@@ -51,7 +51,7 @@ public class RejoinGameTest extends TestBase {
 		// Waiting for player list update.
 		PokerTHMessage msg;
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -66,14 +66,14 @@ public class RejoinGameTest extends TestBase {
 
 		// Game list update (new game)
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListNewMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListNewMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
 
 		// Join game ack.
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+		if (!msg.hasLobbyMessage() || msg.getLobbyMessage().hasJoinGameAckMessage()) {
 			failOnErrorMessage(msg);
 			fail("Could not create game!");
 		}
@@ -81,7 +81,7 @@ public class RejoinGameTest extends TestBase {
 
 		// Game list update (player joined).
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) {
+		if (!msg.hasLobbyMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -99,7 +99,7 @@ public class RejoinGameTest extends TestBase {
 				msg = receiveMessage(s[i]);
 			} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
 					|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -108,23 +108,23 @@ public class RejoinGameTest extends TestBase {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
 			} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 				fail("User " + username + " could not join ranking game.");
 			}
 
 			// The player should have joined the game.
 			msg = receiveMessage();
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
 			msg = receiveMessage();
-			if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())) {
+			if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
 			msg = receiveMessage();
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -132,7 +132,7 @@ public class RejoinGameTest extends TestBase {
 
 		// Server should automatically send start event.
 		msg = receiveMessage();
-		if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())) {
+		if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -140,7 +140,7 @@ public class RejoinGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
 		}
 		// Acknowledge start event.
 		StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
@@ -169,13 +169,13 @@ public class RejoinGameTest extends TestBase {
 
 		// Game list update (game now running).
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
 
 		msg = receiveMessage();
-		if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage())) {
+		if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -190,7 +190,7 @@ public class RejoinGameTest extends TestBase {
 					failOnErrorMessage(inMsg);
 				}
 			}
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
 
 		// Leave the game by closing the socket.
 		sock.close();
@@ -202,7 +202,7 @@ public class RejoinGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage()));
+			} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
 			assertEquals(firstPlayerId, msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
 			assertEquals(PlayerListNotification.playerListLeft, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
 		}
@@ -216,7 +216,7 @@ public class RejoinGameTest extends TestBase {
 			msg = receiveMessage();
 		} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
 				|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -226,7 +226,7 @@ public class RejoinGameTest extends TestBase {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
 		} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 			fail("User " + AuthUser + " could not rejoin normal game.");
 		}
 
@@ -235,7 +235,7 @@ public class RejoinGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage()));
+			} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
 			assertEquals(firstPlayerIdAfterRejoin, msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
 			assertEquals(PlayerListNotification.playerListNew, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
 		}
@@ -244,7 +244,7 @@ public class RejoinGameTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
 
 		assertEquals(gameId, msg.getGameMessage().getGameId());
 		assertEquals(StartEventType.rejoinEvent, msg.getGameMessage().getGameManagementMessage().getStartEventMessage().getStartEventType());
@@ -275,7 +275,7 @@ public class RejoinGameTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage());
 
 		// Check whether we got all necessary data to rejoin.
 		assertEquals(gameId, msg.getGameMessage().getGameId());
@@ -289,7 +289,7 @@ public class RejoinGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage());
 			assertEquals(firstPlayerId, msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getOldPlayerId());
 			assertEquals(firstPlayerIdAfterRejoin, msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getNewPlayerId());
 		}
@@ -298,12 +298,12 @@ public class RejoinGameTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
 		for (int i = 0; i < 9; i++) {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
 		}
 
 		for (int i = 0; i < 9; i++) {
diff --git a/tests/src/de/pokerth/test/RejoinMultiGameTest.java b/tests/src/de/pokerth/test/RejoinMultiGameTest.java
index 9c16db6d..2cab6455 100644
--- a/tests/src/de/pokerth/test/RejoinMultiGameTest.java
+++ b/tests/src/de/pokerth/test/RejoinMultiGameTest.java
@@ -57,7 +57,7 @@ public class RejoinMultiGameTest extends TestBase {
 		// Waiting for player list update.
 		PokerTHMessage msg;
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -72,14 +72,14 @@ public class RejoinMultiGameTest extends TestBase {
 
 		// Game list update (new game)
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListNewMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListNewMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
 
 		// Join game ack.
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 			failOnErrorMessage(msg);
 			fail("Could not create game!");
 		}
@@ -87,7 +87,7 @@ public class RejoinMultiGameTest extends TestBase {
 
 		// Game list update (player joined).
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -107,7 +107,7 @@ public class RejoinMultiGameTest extends TestBase {
 				msg = receiveMessage(s[i]);
 			} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
 					|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -116,23 +116,23 @@ public class RejoinMultiGameTest extends TestBase {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
 			} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 				fail("User " + username + " could not join ranking game.");
 			}
 
 			// The player should have joined the game.
 			msg = receiveMessage();
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
 			msg = receiveMessage();
-			if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())) {
+			if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
 			msg = receiveMessage();
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -140,7 +140,7 @@ public class RejoinMultiGameTest extends TestBase {
 
 		// Server should automatically send start event.
 		msg = receiveMessage();
-		if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())) {
+		if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -148,7 +148,7 @@ public class RejoinMultiGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
 		}
 		// Acknowledge start event.
 		StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
@@ -177,13 +177,13 @@ public class RejoinMultiGameTest extends TestBase {
 
 		// Game list update (game now running).
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
 
 		msg = receiveMessage();
-		if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage())) {
+		if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -198,7 +198,7 @@ public class RejoinMultiGameTest extends TestBase {
 					failOnErrorMessage(inMsg);
 				}
 			}
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
 
 		// 9 players leave the game by closing the socket.
 		for (int i = 0; i < 9; i++) {
@@ -213,7 +213,7 @@ public class RejoinMultiGameTest extends TestBase {
 			do {
 				msg = receiveMessage();
 				failOnErrorMessage(msg);
-			} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage()));
+			} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
 			assertEquals(playerId[i], msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
 			assertEquals(PlayerListNotification.playerListLeft, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
 		}
@@ -231,7 +231,7 @@ public class RejoinMultiGameTest extends TestBase {
 				msg = receiveMessage(s[i]);
 			} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
 					|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -240,7 +240,7 @@ public class RejoinMultiGameTest extends TestBase {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
 			} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
-			if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 				fail("User " + username + " could not rejoin ranking game.");
 			}
 		}
@@ -249,7 +249,7 @@ public class RejoinMultiGameTest extends TestBase {
 			do {
 				msg = receiveMessage();
 				failOnErrorMessage(msg);
-			} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage()));
+			} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
 			assertEquals(playerIdAfterRejoin[i], msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
 			assertEquals(PlayerListNotification.playerListNew, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
 		}
@@ -259,7 +259,7 @@ public class RejoinMultiGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
 	
 			assertEquals(gameId, msg.getGameMessage().getGameId());
 			assertEquals(StartEventType.rejoinEvent, msg.getGameMessage().getGameManagementMessage().getStartEventMessage().getStartEventType());
@@ -292,7 +292,7 @@ public class RejoinMultiGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage());
 	
 			// Check whether we got all necessary data to rejoin.
 			assertEquals(gameId, msg.getGameMessage().getGameId());
@@ -307,7 +307,7 @@ public class RejoinMultiGameTest extends TestBase {
 			do {
 				msg = receiveMessage();
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage());
 			assertEquals(playerId[i], msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getOldPlayerId());
 			assertEquals(playerIdAfterRejoin[i], msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getNewPlayerId());
 		}
@@ -316,19 +316,19 @@ public class RejoinMultiGameTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
 		for (int i = 0; i < 9; i++) {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()));
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
 		}
 
 		// The game should continue to the end.
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-		} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasEndOfGameMessage()));
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasEndOfGameMessage());
 
 		for (int i = 0; i < 9; i++) {
 			s[i].close();
diff --git a/tests/src/de/pokerth/test/RunRankingGameTest.java b/tests/src/de/pokerth/test/RunRankingGameTest.java
index 3ac24bdd..16f6e6b6 100644
--- a/tests/src/de/pokerth/test/RunRankingGameTest.java
+++ b/tests/src/de/pokerth/test/RunRankingGameTest.java
@@ -29,11 +29,17 @@ import java.util.Iterator;
 
 import org.junit.Test;
 
+import de.pokerth.protocol.ProtoBuf.GameEngineMessage;
+import de.pokerth.protocol.ProtoBuf.GameEngineMessage.GameEngineMessageType;
+import de.pokerth.protocol.ProtoBuf.GameManagementMessage;
+import de.pokerth.protocol.ProtoBuf.GameMessage;
 import de.pokerth.protocol.ProtoBuf.MyActionRequestMessage;
 import de.pokerth.protocol.ProtoBuf.NetGameInfo;
 import de.pokerth.protocol.ProtoBuf.NetPlayerAction;
 import de.pokerth.protocol.ProtoBuf.PlayerResult;
 import de.pokerth.protocol.ProtoBuf.StartEventAckMessage;
+import de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType;
+import de.pokerth.protocol.ProtoBuf.GameMessage.GameMessageType;
 import de.pokerth.protocol.ProtoBuf.NetGameInfo.EndRaiseMode;
 import de.pokerth.protocol.ProtoBuf.NetGameInfo.NetGameType;
 import de.pokerth.protocol.ProtoBuf.PokerTHMessage.PokerTHMessageType;
@@ -84,7 +90,7 @@ public class RunRankingGameTest extends TestBase {
 
 		// Game list update (player joined).
 		msg = receiveMessage();
-		if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -100,8 +106,9 @@ public class RunRankingGameTest extends TestBase {
 			// Waiting for player list update.
 			do {
 				msg = receiveMessage(s[i]);
-			} while (msg.hasGameListNewMessage() || msg.hasGamePlayerJoinedMessage());
-			if (!msg.hasPlayerListMessage()) {
+			} while ((msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListNewMessage())
+				|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -109,24 +116,24 @@ public class RunRankingGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!msg.hasJoinGameAckMessage() && !msg.hasJoinGameFailedMessage());
-			if (!msg.hasJoinGameAckMessage()) {
+			} while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage() || !msg.getLobbyMessage().hasJoinGameFailedMessage());
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
 				fail("User " + username + " could not join ranking game.");
 			}
 
 			// The player should have joined the game.
 			msg = receiveMessage();
-			if (!msg.hasPlayerListMessage()) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
 			msg = receiveMessage();
-			if (!msg.hasGamePlayerJoinedMessage()) {
+			if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
 			msg = receiveMessage();
-			if (!msg.hasGameListPlayerJoinedMessage()) {
+			if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
 				failOnErrorMessage(msg);
 				fail("Invalid message.");
 			}
@@ -134,7 +141,7 @@ public class RunRankingGameTest extends TestBase {
 
 		// Server should automatically send start event.
 		msg = receiveMessage();
-		if (!msg.hasStartEventMessage()) {
+		if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -142,16 +149,28 @@ public class RunRankingGameTest extends TestBase {
 			do {
 				msg = receiveMessage(s[i]);
 				failOnErrorMessage(msg);
-			} while (!msg.hasStartEventMessage());
+			} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
 		}
 		// Acknowledge start event.
 		StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
-			.setGameId(gameId)
-			.build();
+				.build();
+
+		GameManagementMessage gameManagement = GameManagementMessage.newBuilder()
+				.setMessageType(GameManagementMessageType.Type_StartEventAckMessage)
+				.setStartEventAckMessage(startAck)
+				.build();
+
+		GameMessage game = GameMessage.newBuilder()
+				.setGameId(gameId)
+				.setMessageType(GameMessageType.Type_GameManagementMessage)
+				.setGameManagementMessage(gameManagement)
+				.build();
+			
 		msg = PokerTHMessage.newBuilder()
-			.setMessageType(PokerTHMessageType.Type_StartEventAckMessage)
-			.setStartEventAckMessage(startAck)
-			.build();
+				.setMessageType(PokerTHMessageType.Type_GameMessage)
+				.setGameMessage(game)
+				.build();
+
 		sendMessage(msg);
 		for (int i = 0; i < 9; i++) {
 			sendMessage(msg, s[i]);
@@ -159,13 +178,13 @@ public class RunRankingGameTest extends TestBase {
 
 		// Game list update (game now running).
 		msg = receiveMessage();
-		if (!msg.hasGameListUpdateMessage()) {
+		if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
 
 		msg = receiveMessage();
-		if (!msg.hasGameStartInitialMessage()) {
+		if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage()) {
 			failOnErrorMessage(msg);
 			fail("Invalid message.");
 		}
@@ -175,11 +194,11 @@ public class RunRankingGameTest extends TestBase {
 		do {
 			msg = receiveMessage();
 			failOnErrorMessage(msg);
-			if (msg.hasHandStartMessage()) {
+			if (msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()) {
 				handNum++;
 				// Cards should be encrypted for registered users.
-				assertTrue(msg.getHandStartMessage().hasEncryptedCards());
-				byte[] encData = msg.getHandStartMessage().getEncryptedCards().toByteArray();
+				assertTrue(msg.getGameMessage().getGameEngineMessage().getHandStartMessage().hasEncryptedCards());
+				byte[] encData = msg.getGameMessage().getGameEngineMessage().getHandStartMessage().getEncryptedCards().toByteArray();
 				byte[] cardData = decryptCards(AuthPassword, encData);
 				int size = cardData.length;
 				while (size > 0 && cardData[size-1] == 0) {
@@ -201,19 +220,32 @@ public class RunRankingGameTest extends TestBase {
 				assertTrue(card2 < 52);
 				assertTrue(card2 >= 0);
 			}
-			else if (msg.hasPlayersTurnMessage()) {
-				if (msg.getPlayersTurnMessage().getPlayerId() == firstPlayerId) {
+			else if (msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasPlayersTurnMessage()) {
+				if (msg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getPlayerId() == firstPlayerId) {
+
 					MyActionRequestMessage myRequest = MyActionRequestMessage.newBuilder()
-						.setGameId(gameId)
-						.setGameState(msg.getPlayersTurnMessage().getGameState())
-						.setHandNum(handNum)
-						.setMyAction(NetPlayerAction.netActionAllIn)
-						.setMyRelativeBet(0)
-						.build();
+							.setGameState(msg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getGameState())
+							.setHandNum(handNum)
+							.setMyAction(NetPlayerAction.netActionAllIn)
+							.setMyRelativeBet(0)
+							.build();
+
+					GameEngineMessage gameEngine = GameEngineMessage.newBuilder()
+							.setMessageType(GameEngineMessageType.Type_MyActionRequestMessage)
+							.setMyActionRequestMessage(myRequest)
+							.build();
+
+					game = GameMessage.newBuilder()
+							.setGameId(gameId)
+							.setMessageType(GameMessageType.Type_GameEngineMessage)
+							.setGameEngineMessage(gameEngine)
+							.build();
+						
 					PokerTHMessage outMsg = PokerTHMessage.newBuilder()
-						.setMessageType(PokerTHMessageType.Type_MyActionRequestMessage)
-						.setMyActionRequestMessage(myRequest)
-						.build();
+							.setMessageType(PokerTHMessageType.Type_GameMessage)
+							.setGameMessage(game)
+							.build();
+
 					sendMessage(outMsg);
 				}
 			}
@@ -221,27 +253,39 @@ public class RunRankingGameTest extends TestBase {
 				while (s[i].getInputStream().available() > 0) {
 					PokerTHMessage inMsg = receiveMessage(s[i]);
 					failOnErrorMessage(inMsg);
-					if (inMsg.hasPlayersTurnMessage()) {
-						if (inMsg.getPlayersTurnMessage().getPlayerId() == playerId[i]) {
+					if (inMsg.hasGameMessage() && inMsg.getGameMessage().hasGameEngineMessage() && inMsg.getGameMessage().getGameEngineMessage().hasPlayersTurnMessage()) {
+						if (inMsg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getPlayerId() == playerId[i]) {
 
 							MyActionRequestMessage myRequest = MyActionRequestMessage.newBuilder()
-								.setGameId(gameId)
-								.setGameState(inMsg.getPlayersTurnMessage().getGameState())
-								.setHandNum(handNum)
-								.setMyAction(NetPlayerAction.netActionFold)
-								.setMyRelativeBet(0)
-								.build();
+									.setGameState(msg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getGameState())
+									.setHandNum(handNum)
+									.setMyAction(NetPlayerAction.netActionFold)
+									.setMyRelativeBet(0)
+									.build();
+
+							GameEngineMessage gameEngine = GameEngineMessage.newBuilder()
+									.setMessageType(GameEngineMessageType.Type_MyActionRequestMessage)
+									.setMyActionRequestMessage(myRequest)
+									.build();
+
+							game = GameMessage.newBuilder()
+									.setGameId(gameId)
+									.setMessageType(GameMessageType.Type_GameEngineMessage)
+									.setGameEngineMessage(gameEngine)
+									.build();
+								
 							PokerTHMessage outMsg = PokerTHMessage.newBuilder()
-								.setMessageType(PokerTHMessageType.Type_MyActionRequestMessage)
-								.setMyActionRequestMessage(myRequest)
-								.build();
+									.setMessageType(PokerTHMessageType.Type_GameMessage)
+									.setGameMessage(game)
+									.build();
+
 							sendMessage(outMsg, s[i]);
 						}
 					}
-					else if (inMsg.hasEndOfHandHideCardsMessage()) {
-						lastPlayerMoney = inMsg.getEndOfHandHideCardsMessage().getPlayerMoney();
-					} else if (inMsg.hasEndOfHandShowCardsMessage()) {
-						Collection<PlayerResult> result = inMsg.getEndOfHandShowCardsMessage().getPlayerResultsList();
+					else if (inMsg.hasGameMessage() && inMsg.getGameMessage().hasGameEngineMessage() && inMsg.getGameMessage().getGameEngineMessage().hasEndOfHandHideCardsMessage()) {
+						lastPlayerMoney = inMsg.getGameMessage().getGameEngineMessage().getEndOfHandHideCardsMessage().getPlayerMoney();
+					} else if (inMsg.hasGameMessage() && inMsg.getGameMessage().hasGameEngineMessage() && inMsg.getGameMessage().getGameEngineMessage().hasEndOfHandShowCardsMessage()) {
+						Collection<PlayerResult> result = inMsg.getGameMessage().getGameEngineMessage().getEndOfHandShowCardsMessage().getPlayerResultsList();
 						assertFalse(result.isEmpty());
 						int maxPlayerMoney = 0;
 						for (Iterator<PlayerResult> it = result.iterator(); it.hasNext(); ) {
@@ -255,7 +299,7 @@ public class RunRankingGameTest extends TestBase {
 					}
 				}
 			}
-		} while (!msg.hasEndOfGameMessage());
+		} while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasEndOfGameMessage());
 
 		for (int i = 0; i < 9; i++) {
 			s[i].close();