diff --git a/Mage.Tests/config/config.xml b/Mage.Tests/config/config.xml
index 9733c9db7e..df6998b9b9 100644
--- a/Mage.Tests/config/config.xml
+++ b/Mage.Tests/config/config.xml
@@ -9,8 +9,8 @@
 		<playerType name="Computer - minimax hybrid" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>
 	</playerTypes>
 	<gameTypes>
-		<gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerDuel" typeName="mage.game.TwoPlayerDuelType"/>
-		<gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAll" typeName="mage.game.FreeForAllType"/>
+		<gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerMatch" typeName="mage.game.TwoPlayerDuelType"/>
+		<gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
 	</gameTypes>
 	<deckTypes>
 		<deckType name="Constructed" jar="mage-deck-constructed.jar" className="mage.deck.Constructed"/>
diff --git a/Mage.Tests/src/test/java/org/mage/test/base/MageBase.java b/Mage.Tests/src/test/java/org/mage/test/base/MageBase.java
index 6bda8ab0fc..37c47c9096 100644
--- a/Mage.Tests/src/test/java/org/mage/test/base/MageBase.java
+++ b/Mage.Tests/src/test/java/org/mage/test/base/MageBase.java
@@ -15,9 +15,7 @@ import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -104,9 +102,9 @@ public class MageBase {
                     logger.info("IN >> " + callback.getMessageId() + " - " + callback.getMethod());
                     try {
                         if (callback.getMethod().equals("startGame")) {
-                            UUID[] data = (UUID[]) callback.getData();
-                            gameId = data[0];
-                            playerId = data[1];
+                            TableClientMessage data = (TableClientMessage) callback.getData();
+                            gameId = data.getGameId();
+                            playerId = data.getPlayerId();
                             server.joinGame(gameId, sessionId);
                         } else if (callback.getMethod().equals("gameInit")) {
                             server.ack("gameInit", sessionId);