diff --git a/tests/src/pokerth_test/PlayerInfoTest.java b/tests/src/pokerth_test/PlayerInfoTest.java
index 83c031de..bbafd75d 100644
--- a/tests/src/pokerth_test/PlayerInfoTest.java
+++ b/tests/src/pokerth_test/PlayerInfoTest.java
@@ -84,11 +84,11 @@ public class PlayerInfoTest extends TestBase {
 			assertTrue(reply.getValue().getPlayerId().getValue() == firstPlayerId);
 			assertTrue(reply.getValue().getPlayerInfoResult().isPlayerInfoDataSelected());
 			PlayerInfoData info = reply.getValue().getPlayerInfoResult().getPlayerInfoData();
-			assertEquals(info.getPlayerName(), GuestUser);
-			assertEquals(info.getCountryCode(), null);
+			assertEquals(GuestUser, info.getPlayerName());
+			assertEquals(null, info.getCountryCode());
 			assertTrue(info.getIsHuman());
-			assertEquals(info.getPlayerRights().getValue(), PlayerInfoRights.EnumType.playerRightsGuest);
-			assertEquals(info.getAvatarData(), null);
+			assertEquals(PlayerInfoRights.EnumType.playerRightsGuest, info.getPlayerRights().getValue());
+			assertEquals(null, info.getAvatarData());
 		}
 		// Request other players' info.
 		for (int i = 0; i < 9; i++) {
@@ -101,16 +101,16 @@ public class PlayerInfoTest extends TestBase {
 			assertTrue(reply.getValue().getPlayerId().getValue() == playerId[i]);
 			assertTrue(reply.getValue().getPlayerInfoResult().isPlayerInfoDataSelected());
 			PlayerInfoData info = reply.getValue().getPlayerInfoResult().getPlayerInfoData();
-			assertEquals(info.getPlayerName(), "test" + (i+1));
-			assertEquals(info.getCountryCode(), null);
+			assertEquals("test" + (i+1), info.getPlayerName());
+			assertEquals(null, info.getCountryCode());
 			assertTrue(info.getIsHuman());
-			assertEquals(info.getPlayerRights().getValue(), PlayerInfoRights.EnumType.playerRightsNormal);
+			assertEquals(PlayerInfoRights.EnumType.playerRightsNormal, info.getPlayerRights().getValue());
 			// Every second player has an avatar, see above.
 			if (i % 2 == 0) {
-				assertEquals(info.getAvatarData(), null);
+				assertEquals(null, info.getAvatarData());
 			} else {
 				assertTrue(Arrays.equals(info.getAvatarData().getAvatar().getValue(), avatarHash));
-				assertEquals(info.getAvatarData().getAvatarType().getValue(), NetAvatarType.EnumType.avatarImagePng);
+				assertEquals(NetAvatarType.EnumType.avatarImagePng, info.getAvatarData().getAvatarType().getValue());
 			}
 		}
 		// Request invalid player info.
diff --git a/tests/src/pokerth_test/RunRankingGameTest.java b/tests/src/pokerth_test/RunRankingGameTest.java
index 53a37958..af68342a 100644
--- a/tests/src/pokerth_test/RunRankingGameTest.java
+++ b/tests/src/pokerth_test/RunRankingGameTest.java
@@ -264,7 +264,7 @@ public class RunRankingGameTest extends TestBase {
 		gameResult.first();
 		long idgame = gameResult.getLong(1);
 		String dbGameName = gameResult.getString(2);
-		assertEquals(gameName, dbGameName);
+		assertEquals(dbGameName, gameName);
 		java.sql.Timestamp gameStart = gameResult.getTimestamp(3);
 		java.sql.Timestamp gameEnd = gameResult.getTimestamp(4);
 		assertTrue(gameEnd.after(gameStart));
@@ -276,11 +276,11 @@ public class RunRankingGameTest extends TestBase {
 		// Check database entries for the players in the game.
 		ResultSet gamePlayerResult = dbStatement.executeQuery("SELECT COUNT(DISTINCT player_idplayer) FROM game_has_player WHERE game_idgame = " + idgame);
 		gamePlayerResult.first();
-		assertEquals(gamePlayerResult.getLong(1), 10);
+		assertEquals(10, gamePlayerResult.getLong(1));
 		// The one who always went all in should have won!
 		ResultSet winnerResult = dbStatement.executeQuery(
 				"SELECT place FROM game_has_player LEFT JOIN player_login on (game_has_player.player_idplayer = player_login.id) WHERE game_idgame = " + idgame + " AND username = '" + AuthUser + "'");
 		winnerResult.first();
-		assertEquals(winnerResult.getLong(1), 1);
+		assertEquals(1, winnerResult.getLong(1));
 	}
 }
diff --git a/tests/src/pokerth_test/TestBase.java b/tests/src/pokerth_test/TestBase.java
index 5e6479f4..67cb8757 100644
--- a/tests/src/pokerth_test/TestBase.java
+++ b/tests/src/pokerth_test/TestBase.java
@@ -87,8 +87,7 @@ public abstract class TestBase {
 	public long guestInit(Socket s) throws Exception {
 		long playerId = 0;
 		PokerTHMessage msg = receiveMessage(s);
-		AnnounceMessage announce = msg.getAnnounceMessage();
-		assertTrue(announce.getValue().getServerType().getValue() == ServerTypeEnumType.EnumType.serverTypeInternetAuth);
+		assertTrue(msg.isAnnounceMessageSelected());
 
 		Version requestedVersion = new Version();
 		requestedVersion.setMajor(PROTOCOL_VERSION_MAJOR);