diff --git a/src/magic/game/state/GameLoader.java b/src/magic/game/state/GameLoader.java
index a982e61eb7..6e3e8db89e 100644
--- a/src/magic/game/state/GameLoader.java
+++ b/src/magic/game/state/GameLoader.java
@@ -68,7 +68,7 @@ public final class GameLoader {
         // Battlefield
         final List<GameCardState> permanents = playerState.getPermanents();
         for (GameCardState permanent : permanents) {
-            TestGameBuilder.createPermanent(game, player, permanent.getCardName(), permanent.isTapped(), permanent.getQuantity());
+            TestGameBuilder.createPermanent(player, permanent.getCardName(), permanent.isTapped(), permanent.getQuantity());
         }
 
         // Hand
diff --git a/src/magic/test/TestAEtherVial.java b/src/magic/test/TestAEtherVial.java
index 82c5c07ddc..9c4424ddf3 100644
--- a/src/magic/test/TestAEtherVial.java
+++ b/src/magic/test/TestAEtherVial.java
@@ -17,7 +17,7 @@ class TestAEtherVial extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"AEther Vial",1);
         addToHand(P,"Legacy's Allure",1);
         addToHand(P,"Thieving Magpie",1);
@@ -28,7 +28,7 @@ class TestAEtherVial extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Thieving Magpie",3);
 
         return game;
diff --git a/src/magic/test/TestAILandSkip.java b/src/magic/test/TestAILandSkip.java
index 6191e61547..cf1cc56501 100644
--- a/src/magic/test/TestAILandSkip.java
+++ b/src/magic/test/TestAILandSkip.java
@@ -17,13 +17,13 @@ class TestAILandSkip extends TestGameBuilder {
 
     P.setLife(19);
     addToLibrary(P, "Swamp", 10);
-    createPermanent(game, P, "Swamp", false, 2);
-    createPermanent(game, P, "Watery Grave", false, 1);
-    createPermanent(game, P, "Darkslick Shores", false, 1);
-    createPermanent(game, P, "Creeping Tar Pit", false, 1);
-    createPermanent(game, P, "Drowned Catacomb", false, 1);
-    createPermanent(game, P, "Hypnotic Specter", false, 2);
-    createPermanent(game, P, "Shadowmage Infiltrator", false, 2);
+    createPermanent(P, "Swamp", false, 2);
+    createPermanent(P, "Watery Grave", false, 1);
+    createPermanent(P, "Darkslick Shores", false, 1);
+    createPermanent(P, "Creeping Tar Pit", false, 1);
+    createPermanent(P, "Drowned Catacomb", false, 1);
+    createPermanent(P, "Hypnotic Specter", false, 2);
+    createPermanent(P, "Shadowmage Infiltrator", false, 2);
     addToHand(P, "Force Spike", 2);
     addToHand(P, "Mana Leak", 1);
     addToHand(P, "Nekrataal", 1);
@@ -38,9 +38,9 @@ class TestAILandSkip extends TestGameBuilder {
 
     P.setLife(10);
     addToLibrary(P, "Mountain", 10);
-    createPermanent(game, P, "Mountain", false, 2);
-    createPermanent(game, P, "Blood Crypt", false, 1);
-    createPermanent(game, P, "Skullclamp", false, 1);
+    createPermanent(P, "Mountain", false, 2);
+    createPermanent(P, "Blood Crypt", false, 1);
+    createPermanent(P, "Skullclamp", false, 1);
     addToHand(P, "Blood Crypt", 2); // originally 5 cards in hand
     addToHand(P, "Wort, Boggart Auntie", 1);
     addToGraveyard(P, "Mountain", 1);
diff --git a/src/magic/test/TestAbilities.java b/src/magic/test/TestAbilities.java
index be855be0f3..14b6224cf5 100644
--- a/src/magic/test/TestAbilities.java
+++ b/src/magic/test/TestAbilities.java
@@ -17,14 +17,14 @@ class TestAbilities extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,20);
-        createPermanent(game,P,"Accorder Paladin",false,100);
-        createPermanent(game,P,"Lightning Greaves",false,1);
-        createPermanent(game,P,"Sword of Body and Mind",false,1);
-        createPermanent(game,P,"Darksteel Axe",false,1);
-        createPermanent(game,P,"Akroma's Memorial",false,1);
-        createPermanent(game,P,"Imperious Perfect",false,1);
-        createPermanent(game,P,"Imperious Perfect",false,1);
+        createPermanent(P,"Rupture Spire",false,20);
+        createPermanent(P,"Accorder Paladin",false,100);
+        createPermanent(P,"Lightning Greaves",false,1);
+        createPermanent(P,"Sword of Body and Mind",false,1);
+        createPermanent(P,"Darksteel Axe",false,1);
+        createPermanent(P,"Akroma's Memorial",false,1);
+        createPermanent(P,"Imperious Perfect",false,1);
+        createPermanent(P,"Imperious Perfect",false,1);
         addToHand(P,"Naturalize",5);
         addToHand(P,"Demystify",3);
         addToHand(P,"Doom Blade",5);
@@ -38,10 +38,10 @@ class TestAbilities extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sword of Body and Mind",false,1);
-        createPermanent(game,P,"Bladed Pinions",false,1);
-        createPermanent(game,P,"Acidic Slime",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sword of Body and Mind",false,1);
+        createPermanent(P,"Bladed Pinions",false,1);
+        createPermanent(P,"Acidic Slime",false,3);
         addToHand(P,"Unquestioned Authority",1);
 
         return game;
diff --git a/src/magic/test/TestAltacBloodseeker.java b/src/magic/test/TestAltacBloodseeker.java
index 4d0220b35f..76568425c7 100644
--- a/src/magic/test/TestAltacBloodseeker.java
+++ b/src/magic/test/TestAltacBloodseeker.java
@@ -17,18 +17,18 @@ class TestAltacBloodseeker extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,8);
-        createPermanent(game,P,"Chromatic Lantern",false,1);
-        createPermanent(game, P, "Altac Bloodseeker", false, 4);
-        createPermanent(game, P, "Advance Scout", false, 1);
+        createPermanent(P,"Plains",false,8);
+        createPermanent(P,"Chromatic Lantern",false,1);
+        createPermanent(P, "Altac Bloodseeker", false, 4);
+        createPermanent(P, "Advance Scout", false, 1);
 
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game, P, "Llanowar Elves", false, 5);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P, "Llanowar Elves", false, 5);
 
         return game;
     }
diff --git a/src/magic/test/TestArcboundOverseer.java b/src/magic/test/TestArcboundOverseer.java
index 7d58cff1d9..9d8a1b2a92 100644
--- a/src/magic/test/TestArcboundOverseer.java
+++ b/src/magic/test/TestArcboundOverseer.java
@@ -17,7 +17,7 @@ class TestArcboundOverseer extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Arcbound Overseer", 1);
         addToHand(P, "Arcbound Ravager", 1);
 
@@ -25,7 +25,7 @@ class TestArcboundOverseer extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestAura.java b/src/magic/test/TestAura.java
index 7349ad4c30..b8d0982dfb 100644
--- a/src/magic/test/TestAura.java
+++ b/src/magic/test/TestAura.java
@@ -17,8 +17,8 @@ class TestAura extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,8);
-        createPermanent(game,P,"Chromatic Lantern",false,1);
+        createPermanent(P,"Plains",false,8);
+        createPermanent(P,"Chromatic Lantern",false,1);
         addToHand(P,"Annex",1);
         addToHand(P,"Chimeric Mass",1);
         addToHand(P,"Rancor",1);
@@ -31,8 +31,8 @@ class TestAura extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestAuraScript.java b/src/magic/test/TestAuraScript.java
index 4e35782cca..f91598d360 100644
--- a/src/magic/test/TestAuraScript.java
+++ b/src/magic/test/TestAuraScript.java
@@ -18,8 +18,8 @@ class TestAuraScript extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P,"Dark Favor",1);
         addToHand(P,"Legacy's Allure",1);
         addToHand(P,"Thieving Magpie",1);
@@ -28,7 +28,7 @@ class TestAuraScript extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Thieving Magpie",3);
 
         return game;
diff --git a/src/magic/test/TestAvarax.java b/src/magic/test/TestAvarax.java
index 4fe1c0a2e9..95aa49331e 100644
--- a/src/magic/test/TestAvarax.java
+++ b/src/magic/test/TestAvarax.java
@@ -19,8 +19,8 @@ class TestAvarax extends TestGameBuilder {
         P.setLife(20);
         addToLibrary(P, "Avarax", 3);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,8);
-        createPermanent(game,P,"Chromatic Lantern",false,1);
+        createPermanent(P,"Plains",false,8);
+        createPermanent(P,"Chromatic Lantern",false,1);
         addToHand(P,"Avarax",1);
         addToHand(P, "Borderland Ranger", 1);
 
@@ -29,7 +29,7 @@ class TestAvarax extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestBairn.java b/src/magic/test/TestBairn.java
index c1d1697c9d..35491bfc07 100644
--- a/src/magic/test/TestBairn.java
+++ b/src/magic/test/TestBairn.java
@@ -18,15 +18,15 @@ class TestBairn extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game, P, "Wall of Denial", 5);
+        createPermanent(P, "Wall of Denial", 5);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Island", 20);
-        createPermanent(game, P, "Island", 10);
-        createPermanent(game, P, "Gilder Bairn");
-        createPermanent(game, P, "Paradise Mantle", 1);
+        createPermanent(P, "Island", 10);
+        createPermanent(P, "Gilder Bairn");
+        createPermanent(P, "Paradise Mantle", 1);
         addToHand(P, "Simic Initiate", 4);
 
         return game;
diff --git a/src/magic/test/TestBattalion.java b/src/magic/test/TestBattalion.java
index f81770e49a..7c97d3f82e 100644
--- a/src/magic/test/TestBattalion.java
+++ b/src/magic/test/TestBattalion.java
@@ -17,7 +17,7 @@ class TestBattalion extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Bomber Corps", 1);
         addToHand(P, "Boros Elite", 1);
         addToHand(P, "Daring Skyjek", 1);
@@ -34,7 +34,7 @@ class TestBattalion extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Grizzly Bears", 1);
         addToHand(P, "Manalith", 1);
 
diff --git a/src/magic/test/TestBlockerOrder.java b/src/magic/test/TestBlockerOrder.java
index a46bc07682..31d3cde3d2 100644
--- a/src/magic/test/TestBlockerOrder.java
+++ b/src/magic/test/TestBlockerOrder.java
@@ -18,10 +18,10 @@ class TestBlockerOrder extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(0);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,1);
-        createPermanent(game,P,"Akrasan Squire",false,1);
-        createPermanent(game,P,"Birds of Paradise",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,1);
+        createPermanent(P,"Akrasan Squire",false,1);
+        createPermanent(P,"Birds of Paradise",false,1);
         addToHand(P, "Giant Growth", 3);
 
         P = opponent;
@@ -29,9 +29,9 @@ class TestBlockerOrder extends TestGameBuilder {
         P.setLife(2);
         P.setPoison(0);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,5);
-        createPermanent(game,P,"Yavimaya Wurm",false,1);
-        createPermanent(game,P,"Yavimaya Wurm",false,1);
+        createPermanent(P,"Rupture Spire",false,5);
+        createPermanent(P,"Yavimaya Wurm",false,1);
+        createPermanent(P,"Yavimaya Wurm",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestBloodArtistWrath.java b/src/magic/test/TestBloodArtistWrath.java
index 61f1fcd6f8..559647a05d 100644
--- a/src/magic/test/TestBloodArtistWrath.java
+++ b/src/magic/test/TestBloodArtistWrath.java
@@ -17,19 +17,19 @@ class TestBloodArtistWrath extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Avacynian Priest",false,1);
-        createPermanent(game,P,"Avacynian Priest",false,1);
-        createPermanent(game,P,"Blood Artist",false,1);
-        createPermanent(game,P,"Grizzly Bears",false,1);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Avacynian Priest",false,1);
+        createPermanent(P,"Avacynian Priest",false,1);
+        createPermanent(P,"Blood Artist",false,1);
+        createPermanent(P,"Grizzly Bears",false,1);
+        createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P, "Wrath of God", 1);
 
         P = opponent;
 
         P.setLife(5);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestBloodrush.java b/src/magic/test/TestBloodrush.java
index 9094dfa5a0..928b6c65e2 100644
--- a/src/magic/test/TestBloodrush.java
+++ b/src/magic/test/TestBloodrush.java
@@ -17,7 +17,7 @@ class TestBloodrush extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Ghor-Clan Rampager", 1);
         addToHand(P, "Rubblehulk", 1);
         addToHand(P, "Scorchwalker", 1);
@@ -30,7 +30,7 @@ class TestBloodrush extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Grizzly Bears", 1);
         addToHand(P, "Manalith", 1);
 
diff --git a/src/magic/test/TestBowOfNylea.java b/src/magic/test/TestBowOfNylea.java
index a54c90be3f..d878450478 100644
--- a/src/magic/test/TestBowOfNylea.java
+++ b/src/magic/test/TestBowOfNylea.java
@@ -21,9 +21,9 @@ class TestBowOfNylea extends TestGameBuilder {
         addToGraveyard(P, "Mountain", 10);
         addToGraveyard(P, "Lightning Bolt", 1);
         addToGraveyard(P, "Mountain", 10);
-        createPermanent(game,P, "Mountain", false, 8);
-        createPermanent(game,P, "Chromatic Lantern", false, 1);
-        createPermanent(game,P, "Bow of Nylea", false, 1);
+        createPermanent(P, "Mountain", false, 8);
+        createPermanent(P, "Chromatic Lantern", false, 1);
+        createPermanent(P, "Bow of Nylea", false, 1);
 
         P = opponent;
 
@@ -33,9 +33,9 @@ class TestBowOfNylea extends TestGameBuilder {
         addToGraveyard(P, "Mountain", 10);
         addToGraveyard(P, "Lightning Bolt", 1);
         addToGraveyard(P, "Mountain", 10);
-        createPermanent(game,P, "Mountain", false, 8);
-        createPermanent(game,P, "Chromatic Lantern", false, 1);
-        createPermanent(game,P, "Bow of Nylea", false, 1);
+        createPermanent(P, "Mountain", false, 8);
+        createPermanent(P, "Chromatic Lantern", false, 1);
+        createPermanent(P, "Bow of Nylea", false, 1);
 
         return game;
     }
diff --git a/src/magic/test/TestCadaverousKnight.java b/src/magic/test/TestCadaverousKnight.java
index 3005aafc90..b02ac6401a 100644
--- a/src/magic/test/TestCadaverousKnight.java
+++ b/src/magic/test/TestCadaverousKnight.java
@@ -18,15 +18,15 @@ class TestCadaverousKnight extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Cadaverous Knight",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Cadaverous Knight",false,1);
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestCalciteSnapper.java b/src/magic/test/TestCalciteSnapper.java
index f969f81707..c9e9c9ba75 100644
--- a/src/magic/test/TestCalciteSnapper.java
+++ b/src/magic/test/TestCalciteSnapper.java
@@ -17,7 +17,7 @@ class TestCalciteSnapper extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Calcite Snapper",1);
 
 
@@ -25,7 +25,7 @@ class TestCalciteSnapper extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Calcite Snapper",1);
 
         return game;
diff --git a/src/magic/test/TestCanPlayAct.java b/src/magic/test/TestCanPlayAct.java
index 75edc92280..6c6989ee99 100644
--- a/src/magic/test/TestCanPlayAct.java
+++ b/src/magic/test/TestCanPlayAct.java
@@ -21,8 +21,8 @@ class TestCanPlayAct extends TestGameBuilder {
         addToLibrary(P, "Entreat the Angels", 20);
         addToLibrary(P, "Sliver Overlord", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 3);
-        createPermanent(game,P, "Mountain", false, 1);
-        createPermanent(game,P, "Kher Keep", false, 1);
+        createPermanent(P, "Mountain", false, 1);
+        createPermanent(P, "Kher Keep", false, 1);
         addToHand(P, "Lightning Bolt", 1);
         addToHand(P, "Mountain", 1);
         addToHand(P, "Argothian Wurm", 1);
@@ -33,8 +33,8 @@ class TestCanPlayAct extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Trained Jackal", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
diff --git a/src/magic/test/TestCarrionAnts.java b/src/magic/test/TestCarrionAnts.java
index f342a94785..b51ee3593b 100644
--- a/src/magic/test/TestCarrionAnts.java
+++ b/src/magic/test/TestCarrionAnts.java
@@ -18,10 +18,10 @@ class TestCarrionAnts extends TestGameBuilder {
 
         P.setLife(15);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Hallowed Fountain",false,2);
-        createPermanent(game,P,"Plains",false,2);
-        createPermanent(game,P,"Angel of Despair",false,1);
-        createPermanent(game,P,"Carrion Ants",false,1);
+        createPermanent(P,"Hallowed Fountain",false,2);
+        createPermanent(P,"Plains",false,2);
+        createPermanent(P,"Angel of Despair",false,1);
+        createPermanent(P,"Carrion Ants",false,1);
         addToHand(P,"Arcane Sanctum",1);
         addToHand(P,"Armadillo Cloak",1);
         addToHand(P,"Blightning",1);
@@ -31,10 +31,10 @@ class TestCarrionAnts extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Plains",false,2);
-        createPermanent(game,P,"Carrion Ants",false,1);
-        createPermanent(game,P,"Raging Gorilla",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Plains",false,2);
+        createPermanent(P,"Carrion Ants",false,1);
+        createPermanent(P,"Raging Gorilla",false,1);
 
         return game;
 
diff --git a/src/magic/test/TestCascade.java b/src/magic/test/TestCascade.java
index f3c8585f29..3df1afffb5 100644
--- a/src/magic/test/TestCascade.java
+++ b/src/magic/test/TestCascade.java
@@ -19,8 +19,8 @@ class TestCascade extends TestGameBuilder {
         addToLibrary(P, "Lightning Bolt", 1);
         addToLibrary(P, "Fling", 1);
         addToGraveyard(P, "Lightning Bolt", 1);
-        createPermanent(game,P, "Mountain", false, 8);
-        createPermanent(game,P, "Chromatic Lantern", false, 1);
+        createPermanent(P, "Mountain", false, 8);
+        createPermanent(P, "Chromatic Lantern", false, 1);
         addToHand(P, "Bloodbraid Elf", 1);
 
         P = opponent;
@@ -29,8 +29,8 @@ class TestCascade extends TestGameBuilder {
         addToLibrary(P, "Forest", 20);
         addToLibrary(P, "Grizzly Bears", 1);
         addToHand(P, "Brainbite", 1);
-        createPermanent(game,P,"Forest",false,5);
-        createPermanent(game,P, "Glasses of Urza", false, 1);
+        createPermanent(P,"Forest",false,5);
+        createPermanent(P, "Glasses of Urza", false, 1);
         addToGraveyard(P, "Grizzly Bears", 1);
 
         return game;
diff --git a/src/magic/test/TestCelestialPurge.java b/src/magic/test/TestCelestialPurge.java
index 5c9c562582..4f1b332277 100644
--- a/src/magic/test/TestCelestialPurge.java
+++ b/src/magic/test/TestCelestialPurge.java
@@ -23,7 +23,7 @@ class TestCelestialPurge extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Sphere of the Suns",1);
         addToHand(P,"Celestial Purge",3);
 
@@ -33,7 +33,7 @@ class TestCelestialPurge extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Stonework Puma",1);
         addToHand(P,"Llanowar Elves", 1);
         addToHand(P,"Prickly Boggart", 1);
diff --git a/src/magic/test/TestChangeMaxLand.java b/src/magic/test/TestChangeMaxLand.java
index cbc85f01d3..0ff8e78ef7 100644
--- a/src/magic/test/TestChangeMaxLand.java
+++ b/src/magic/test/TestChangeMaxLand.java
@@ -18,7 +18,7 @@ class TestMaxLandChange extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Plains", 10);
         addToHand(P, "Exploration", 1);
         addToHand(P, "Explore", 1);
@@ -28,7 +28,7 @@ class TestMaxLandChange extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestChangeling.java b/src/magic/test/TestChangeling.java
index 70db874433..a9a5e336d6 100644
--- a/src/magic/test/TestChangeling.java
+++ b/src/magic/test/TestChangeling.java
@@ -17,16 +17,16 @@ class TestChangeling extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Avian Changeling",false,1);
-        createPermanent(game,P,"Heavy Mattock",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Avian Changeling",false,1);
+        createPermanent(P,"Heavy Mattock",false,1);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Serra Angel",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Serra Angel",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestChronozoa.java b/src/magic/test/TestChronozoa.java
index 7b2aca2d34..bbe48acd16 100644
--- a/src/magic/test/TestChronozoa.java
+++ b/src/magic/test/TestChronozoa.java
@@ -17,7 +17,7 @@ class TestChronozoa extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Chronozoa",1);
         addToHand(P,"Intangible Virtue",1);
         addToHand(P,"Twilight Drover",1);
@@ -27,7 +27,7 @@ class TestChronozoa extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestCipher.java b/src/magic/test/TestCipher.java
index 75bc22f1f0..c3a49f56cc 100644
--- a/src/magic/test/TestCipher.java
+++ b/src/magic/test/TestCipher.java
@@ -17,8 +17,8 @@ class TestCipher extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Swamp", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Battering Krasis", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Battering Krasis", false, 1);
         addToHand(P, "Sunspire Griffin", 1);
         addToHand(P, "Hands of Binding", 1);
         addToHand(P, "Stolen Identity", 1);
@@ -28,8 +28,8 @@ class TestCipher extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
         return game;
diff --git a/src/magic/test/TestClone.java b/src/magic/test/TestClone.java
index 315881f878..87c682eba2 100644
--- a/src/magic/test/TestClone.java
+++ b/src/magic/test/TestClone.java
@@ -18,11 +18,11 @@ class TestClone extends TestGameBuilder {
         P.setLife(6);
         addToLibrary(P, "Swamp", 20);
         addToGraveyard(P, "Body Double", 1);
-        createPermanent(game,P,"Island",false,4);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Glorious Anthem",false,1);
-        createPermanent(game,P,"Chromatic Lantern",false,1);
-        createPermanent(game,P,"Young Wolf",false,1);
+        createPermanent(P,"Island",false,4);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Glorious Anthem",false,1);
+        createPermanent(P,"Chromatic Lantern",false,1);
+        createPermanent(P,"Young Wolf",false,1);
         addToHand(P, "Phantasmal Image", 1);
         addToHand(P, "Clone", 1);
         addToHand(P, "Body Double", 1);
@@ -34,8 +34,8 @@ class TestClone extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
         return game;
diff --git a/src/magic/test/TestCoinFlip.java b/src/magic/test/TestCoinFlip.java
index 9901d90fec..50af3e4b90 100644
--- a/src/magic/test/TestCoinFlip.java
+++ b/src/magic/test/TestCoinFlip.java
@@ -18,8 +18,8 @@ class TestCoinFlip extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Mountain", 10);
-        createPermanent(game,P,"Mountain",false,20);
-        createPermanent(game,P,"Tavern Swindler",false,1);
+        createPermanent(P,"Mountain",false,20);
+        createPermanent(P,"Tavern Swindler",false,1);
         addToHand(P,"Scoria Wurm",1);
         addToHand(P, "Wild Wurm", 3);
         addToHand(P, "Molten Birth", 1);
@@ -29,9 +29,9 @@ class TestCoinFlip extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Mountain",false,20);
-        createPermanent(game,P,"Tavern Swindler",false,1);
-        createPermanent(game,P,"Creepy Doll",false,1);
+        createPermanent(P,"Mountain",false,20);
+        createPermanent(P,"Tavern Swindler",false,1);
+        createPermanent(P,"Creepy Doll",false,1);
         addToHand(P,"Scoria Wurm",1);
         addToHand(P, "Wild Wurm", 3);
 
diff --git a/src/magic/test/TestConfiscate.java b/src/magic/test/TestConfiscate.java
index 19b9e8887b..3ea726527c 100644
--- a/src/magic/test/TestConfiscate.java
+++ b/src/magic/test/TestConfiscate.java
@@ -17,8 +17,8 @@ class TestConfiscate extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 20);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P,"Confiscate",1);
 
 
@@ -26,8 +26,8 @@ class TestConfiscate extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 20);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Serra Angel",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Serra Angel",false,1);
         addToHand(P,"Sword of Body and Mind",1);
 
         return game;
diff --git a/src/magic/test/TestCopyOverload.java b/src/magic/test/TestCopyOverload.java
index a61b6fc964..3e24d194d7 100644
--- a/src/magic/test/TestCopyOverload.java
+++ b/src/magic/test/TestCopyOverload.java
@@ -17,7 +17,7 @@ class TestCopyOverload extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 20);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Street Spasm", 1);
         addToHand(P, "Reverberate", 1);
 
@@ -25,8 +25,8 @@ class TestCopyOverload extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 20);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,2);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,2);
 
         return game;
     }
diff --git a/src/magic/test/TestCounterFlash.java b/src/magic/test/TestCounterFlash.java
index 2008729288..fee4fabdf4 100644
--- a/src/magic/test/TestCounterFlash.java
+++ b/src/magic/test/TestCounterFlash.java
@@ -17,14 +17,14 @@ class TestCounterFlash extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Counterspell",1);
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Restoration Angel",1);
         //addToHand(P,"Grizzly Bears",1);
 
diff --git a/src/magic/test/TestCrumbling.java b/src/magic/test/TestCrumbling.java
index c36b29a517..2d638cbb85 100644
--- a/src/magic/test/TestCrumbling.java
+++ b/src/magic/test/TestCrumbling.java
@@ -17,10 +17,10 @@ class TestCrumbling extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,8);
-        createPermanent(game,P,"Chromatic Lantern");
-        createPermanent(game,P,"Crumbling Sanctuary");
-        createPermanent(game,P,"Samite Healer");
+        createPermanent(P,"Plains",false,8);
+        createPermanent(P,"Chromatic Lantern");
+        createPermanent(P,"Crumbling Sanctuary");
+        createPermanent(P,"Samite Healer");
         addToHand(P, "Palisade Giant", 1);
         addToHand(P, "Lightning Helix", 1);
 
@@ -28,7 +28,7 @@ class TestCrumbling extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestCunningSparkmage.java b/src/magic/test/TestCunningSparkmage.java
index d4c4f5e652..653a8397d3 100644
--- a/src/magic/test/TestCunningSparkmage.java
+++ b/src/magic/test/TestCunningSparkmage.java
@@ -23,12 +23,12 @@ class TestCunningSparkmage extends TestGameBuilder {
         // Library
         addToLibrary(P, "Forest", 10);
         // Battlefield
-        createPermanent(game, P, "Forest", false, 6);
-        createPermanent(game, P, "Quest for the Gemblades", false, 1);
-        createPermanent(game, P, "3/3 green Elephant creature token", false, 1);
-        createPermanent(game, P, "1/1 green Snake creature token", false, 1);
-        createPermanent(game, P, "Strangleroot Geist", false, 2);
-        createPermanent(game, P, "2/2 green Wolf creature token", false, 1);
+        createPermanent(P, "Forest", false, 6);
+        createPermanent(P, "Quest for the Gemblades", false, 1);
+        createPermanent(P, "3/3 green Elephant creature token", false, 1);
+        createPermanent(P, "1/1 green Snake creature token", false, 1);
+        createPermanent(P, "Strangleroot Geist", false, 2);
+        createPermanent(P, "2/2 green Wolf creature token", false, 1);
         // Hand
         addToHand(P, "Forest", 1);
         addToHand(P, "Penumbra Spider", 1);
@@ -43,13 +43,13 @@ class TestCunningSparkmage extends TestGameBuilder {
         addToLibrary(P, "Mountain", 10);
         addToLibrary(P, "Swamp", 10);
         // Battlefield
-        createPermanent(game, P, "Blood Crypt", true, 1);
-        createPermanent(game, P, "Dragonskull Summit", false, 1);
-        createPermanent(game, P, "Mountain", true, 1);
-        createPermanent(game, P, "Rakdos Guildgate", false, 1);
-        createPermanent(game, P, "Cunning Sparkmage", false, 1);
-        createPermanent(game, P, "Ember Hauler", false, 1);
-        createPermanent(game, P, "Lavaborn Muse", false, 1);
+        createPermanent(P, "Blood Crypt", true, 1);
+        createPermanent(P, "Dragonskull Summit", false, 1);
+        createPermanent(P, "Mountain", true, 1);
+        createPermanent(P, "Rakdos Guildgate", false, 1);
+        createPermanent(P, "Cunning Sparkmage", false, 1);
+        createPermanent(P, "Ember Hauler", false, 1);
+        createPermanent(P, "Lavaborn Muse", false, 1);
         // Hand
         addToHand(P, "Mountain", 2);
 
diff --git a/src/magic/test/TestCycling.java b/src/magic/test/TestCycling.java
index 2aae81591c..fb30ac676e 100644
--- a/src/magic/test/TestCycling.java
+++ b/src/magic/test/TestCycling.java
@@ -17,7 +17,7 @@ class TestCycling extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Angelsong", 1);
         addToHand(P, "Fog", 1);
 
@@ -25,7 +25,7 @@ class TestCycling extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Grizzly Bears", 1);
         addToHand(P, "Manalith", 1);
 
diff --git a/src/magic/test/TestDarkDepths.java b/src/magic/test/TestDarkDepths.java
index 6c60cb2821..6ef171989f 100644
--- a/src/magic/test/TestDarkDepths.java
+++ b/src/magic/test/TestDarkDepths.java
@@ -17,14 +17,14 @@ class TestDarkDepths extends TestGameBuilder {
 
         P.setLife(13);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Vampire Hexmage",false,1);
+        createPermanent(P, "Vampire Hexmage",false,1);
         addToHand(P, "Dark Depths", 1);
 
         P = opponent;
 
         P.setLife(13);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P,"Desecration Demon",false,1);
+        createPermanent(P,"Desecration Demon",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestDelayedTrigger.java b/src/magic/test/TestDelayedTrigger.java
index a63ed6c147..196c44fc84 100644
--- a/src/magic/test/TestDelayedTrigger.java
+++ b/src/magic/test/TestDelayedTrigger.java
@@ -17,16 +17,16 @@ class TestDelayedTrigger extends TestGameBuilder {
 
         P.setLife(13);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Forest", false, 8);
-        createPermanent(game,P, "Chromatic Lantern", false, 1);
-        createPermanent(game,P, "Duskmantle Guildmage", false, 1);
-        createPermanent(game,P, "Vizkopa Guildmage",false,1);
+        createPermanent(P, "Forest", false, 8);
+        createPermanent(P, "Chromatic Lantern", false, 1);
+        createPermanent(P, "Duskmantle Guildmage", false, 1);
+        createPermanent(P, "Vizkopa Guildmage",false,1);
 
         P = opponent;
 
         P.setLife(13);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P,"Rupture Spire",false,5);
+        createPermanent(P,"Rupture Spire",false,5);
 
         return game;
     }
diff --git a/src/magic/test/TestDetain.java b/src/magic/test/TestDetain.java
index 72d3f2ae10..ea20d63ab6 100644
--- a/src/magic/test/TestDetain.java
+++ b/src/magic/test/TestDetain.java
@@ -18,8 +18,8 @@ class TestDetain extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Arbor Elf",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Arbor Elf",false,1);
         addToHand(P, "Azorius Arrester", 1);
         addToHand(P, "Isperia's Skywatch", 1);
         addToHand(P, "Soulsworn Spirit", 1);
@@ -32,9 +32,9 @@ class TestDetain extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,1);
-        createPermanent(game,P,"Forest",true,1);
-        createPermanent(game,P,"Shivan Hellkite",false,1);
+        createPermanent(P,"Rupture Spire",false,1);
+        createPermanent(P,"Forest",true,1);
+        createPermanent(P,"Shivan Hellkite",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestDevotion.java b/src/magic/test/TestDevotion.java
index 5c700f5838..d04cb5918f 100644
--- a/src/magic/test/TestDevotion.java
+++ b/src/magic/test/TestDevotion.java
@@ -22,7 +22,7 @@ class TestDevotion extends TestGameBuilder {
         addToLibrary(P, "Sliver Overlord", 1);
         addToLibrary(P, "Wingsteed Rider", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 3);
-        createPermanent(game,P, "Rupture Spire", false, 9);
+        createPermanent(P, "Rupture Spire", false, 9);
         addToHand(P, "Rupture Spire", 1);
         addToHand(P, "Abhorrent Overlord", 1);
         addToHand(P, "Purphoros, God of the Forge", 1);
@@ -32,8 +32,8 @@ class TestDevotion extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Trained Jackal", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
diff --git a/src/magic/test/TestDevourTrigger.java b/src/magic/test/TestDevourTrigger.java
index d80b12ed89..af72a919d6 100644
--- a/src/magic/test/TestDevourTrigger.java
+++ b/src/magic/test/TestDevourTrigger.java
@@ -17,8 +17,8 @@ class TestDevourTrigger extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Kor Firewalker",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Kor Firewalker",false,3);
         addToHand(P,"Predator Dragon",3);
 
 
@@ -26,8 +26,8 @@ class TestDevourTrigger extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestDoubleFaced.java b/src/magic/test/TestDoubleFaced.java
index 6889107415..62a6b03bbe 100644
--- a/src/magic/test/TestDoubleFaced.java
+++ b/src/magic/test/TestDoubleFaced.java
@@ -17,8 +17,8 @@ class TestDoubleFaced extends TestGameBuilder {
 
         P.setLife(5);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Island", false, 8);
-        createPermanent(game,P, "Chromatic Lantern", false, 1);
+        createPermanent(P, "Island", false, 8);
+        createPermanent(P, "Chromatic Lantern", false, 1);
         addToHand(P, "Thraben Sentry", 2);
         addToHand(P, "Lightning Bolt", 1);
         addToHand(P, "Ludevic's Test Subject", 2);
@@ -27,8 +27,8 @@ class TestDoubleFaced extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Island", false, 8);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P, "Island", false, 8);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Ludevic's Test Subject", 2);
 
         return game;
diff --git a/src/magic/test/TestDoubleStrikeDread.java b/src/magic/test/TestDoubleStrikeDread.java
index 5fb3c10439..2ec5ab0d46 100644
--- a/src/magic/test/TestDoubleStrikeDread.java
+++ b/src/magic/test/TestDoubleStrikeDread.java
@@ -17,13 +17,13 @@ class TestDoubleStrikeDread extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Dread",false,1);
-        createPermanent(game,P,"Dissipation Field",false,1);
-        createPermanent(game,P,"Sword of Body and Mind",false,1);
-        createPermanent(game,P,"Sword of Light and Shadow",false,1);
-        createPermanent(game,P,"Hearthfire Hobgoblin", false, 1);
-        createPermanent(game,P,"Oracle of Nectars", false, 1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Dread",false,1);
+        createPermanent(P,"Dissipation Field",false,1);
+        createPermanent(P,"Sword of Body and Mind",false,1);
+        createPermanent(P,"Sword of Light and Shadow",false,1);
+        createPermanent(P,"Hearthfire Hobgoblin", false, 1);
+        createPermanent(P,"Oracle of Nectars", false, 1);
         addToGraveyard(P,"Oracle of Nectars", 1);
         addToHand(P, "Pacifism", 2);
 
@@ -32,10 +32,10 @@ class TestDoubleStrikeDread extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Hearthfire Hobgoblin", false, 1);
-        createPermanent(game,P,"Dread",false,1);
-        createPermanent(game,P,"Dissipation Field",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Hearthfire Hobgoblin", false, 1);
+        createPermanent(P,"Dread",false,1);
+        createPermanent(P,"Dissipation Field",false,1);
         addToHand(P, "Pacifism", 2);
 
         return game;
diff --git a/src/magic/test/TestDragons.java b/src/magic/test/TestDragons.java
index bbebe1aef0..fe3014ba97 100644
--- a/src/magic/test/TestDragons.java
+++ b/src/magic/test/TestDragons.java
@@ -17,7 +17,7 @@ class TestDragons extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Flameblast Dragon",1);
         addToHand(P,"Balefire Dragon",1);
 
@@ -26,7 +26,7 @@ class TestDragons extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Thieving Magpie",3);
 
         return game;
diff --git a/src/magic/test/TestDungeonGeists.java b/src/magic/test/TestDungeonGeists.java
index d453d2c6c5..f345687c47 100644
--- a/src/magic/test/TestDungeonGeists.java
+++ b/src/magic/test/TestDungeonGeists.java
@@ -17,7 +17,7 @@ class TestDungeonGeists extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Dungeon Geists",1);
 
 
@@ -25,8 +25,8 @@ class TestDungeonGeists extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Serra Angel",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Serra Angel",false,1);
         addToHand(P,"Act of Treason",1);
 
         return game;
diff --git a/src/magic/test/TestDystopia.java b/src/magic/test/TestDystopia.java
index 5d876deec9..c17bc9107a 100644
--- a/src/magic/test/TestDystopia.java
+++ b/src/magic/test/TestDystopia.java
@@ -17,15 +17,15 @@ class TestDystopia extends TestGameBuilder {
 
         P.setLife(13);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P,"Dystopia");
-        createPermanent(game,P,"Forest",10);
+        createPermanent(P,"Dystopia");
+        createPermanent(P,"Forest",10);
         addToHand(P, "Life and Limb", 1);
 
         P = opponent;
 
         P.setLife(13);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P,"Forest",10);
+        createPermanent(P,"Forest",10);
         return game;
     }
 }
diff --git a/src/magic/test/TestEntersWithX.java b/src/magic/test/TestEntersWithX.java
index 4144e5e7b3..582302acce 100644
--- a/src/magic/test/TestEntersWithX.java
+++ b/src/magic/test/TestEntersWithX.java
@@ -17,8 +17,8 @@ class TestEntersWithX extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P,"Primordial Hydra",1);
         addToHand(P,"Mikaeus, the Lunarch",1);
         addToHand(P,"Chimeric Mass",1);
@@ -29,8 +29,8 @@ class TestEntersWithX extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P, "Plains", 7);
 
         return game;
diff --git a/src/magic/test/TestEquip.java b/src/magic/test/TestEquip.java
index 2ce95508d7..544fcac16a 100644
--- a/src/magic/test/TestEquip.java
+++ b/src/magic/test/TestEquip.java
@@ -19,9 +19,9 @@ class TestEquip extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Forest", 10);
-        createPermanent(game,P,"Forest",false,8);
-        createPermanent(game,P,"Cylian Elf",false,2);
-        createPermanent(game,P,"Strider Harness",false,1);
+        createPermanent(P,"Forest",false,8);
+        createPermanent(P,"Cylian Elf",false,2);
+        createPermanent(P,"Strider Harness",false,1);
         addToHand(P,"Cylian Elf",1);
 
 
@@ -29,10 +29,10 @@ class TestEquip extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Forest", 10);
-        createPermanent(game,P,"Forest",false,8);
-        createPermanent(game,P,"Cylian Elf",false,2);
-        createPermanent(game,P,"Strider Harness",false,1);
-        //createPermanent(game,P,"Barbed Battlegear",false,1);
+        createPermanent(P,"Forest",false,8);
+        createPermanent(P,"Cylian Elf",false,2);
+        createPermanent(P,"Strider Harness",false,1);
+        //createPermanent(P,"Barbed Battlegear",false,1);
         addToHand(P,"Cylian Elf",1);
 
         return game;
diff --git a/src/magic/test/TestEquipBug.java b/src/magic/test/TestEquipBug.java
index 8440aaae7a..01c915a845 100644
--- a/src/magic/test/TestEquipBug.java
+++ b/src/magic/test/TestEquipBug.java
@@ -18,7 +18,7 @@ class TestEquipBug extends TestGameBuilder {
         P.setLife(20);
         addToLibrary(P, "Forest", 10);
         addToLibrary(P,"Strider Harness",1);
-        createPermanent(game,P,"Forest",false,8);
+        createPermanent(P,"Forest",false,8);
 
         P = opponent;
 
diff --git a/src/magic/test/TestEvolve.java b/src/magic/test/TestEvolve.java
index 0f6a5f9603..ca70e098f7 100644
--- a/src/magic/test/TestEvolve.java
+++ b/src/magic/test/TestEvolve.java
@@ -17,7 +17,7 @@ class TestEvolve extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Crocanura", 1);
         addToHand(P, "Clinging Anemones", 1);
         addToHand(P, "Elusive Krasis", 1);
@@ -29,7 +29,7 @@ class TestEvolve extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Shambleshark", 1);
         addToHand(P, "Adaptive Snapjaw", 1);
         addToHand(P, "Cloudfin Raptor", 1);
diff --git a/src/magic/test/TestExalted.java b/src/magic/test/TestExalted.java
index 001bbbb25c..69c44ed869 100644
--- a/src/magic/test/TestExalted.java
+++ b/src/magic/test/TestExalted.java
@@ -17,7 +17,7 @@ class TestExalted extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rhox Charger",false,2);
+        createPermanent(P,"Rhox Charger",false,2);
 
 
         P = opponent;
diff --git a/src/magic/test/TestExhaustion.java b/src/magic/test/TestExhaustion.java
index 9ba043ba6e..112e34d229 100644
--- a/src/magic/test/TestExhaustion.java
+++ b/src/magic/test/TestExhaustion.java
@@ -17,15 +17,15 @@ class TestExhaustion extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P, "Brain Freeze", 1);
 
         P = opponent;
 
         P.setLife(3);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Exhaustion", 1);
 
         return game;
diff --git a/src/magic/test/TestExileToken.java b/src/magic/test/TestExileToken.java
index 3356304bc7..06205174d1 100644
--- a/src/magic/test/TestExileToken.java
+++ b/src/magic/test/TestExileToken.java
@@ -17,7 +17,7 @@ class TestExileToken extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Journey to Nowhere",1);
         addToHand(P,"Naturalize",1);
 
@@ -26,7 +26,7 @@ class TestExileToken extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Rise of the Hobgoblins",1);
 
         return game;
diff --git a/src/magic/test/TestExplore.java b/src/magic/test/TestExplore.java
index a7355c869a..2a78a85a3f 100644
--- a/src/magic/test/TestExplore.java
+++ b/src/magic/test/TestExplore.java
@@ -22,7 +22,7 @@ class TestExplore extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Plains",3);
         addToHand(P,"Explore",3);
 
@@ -31,8 +31,8 @@ class TestExplore extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader", false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader", false,1);
         addToHand(P,"Vines of Vastwood",1);
 
         return game;
diff --git a/src/magic/test/TestExtort.java b/src/magic/test/TestExtort.java
index b45649b57a..964e5f5338 100644
--- a/src/magic/test/TestExtort.java
+++ b/src/magic/test/TestExtort.java
@@ -17,7 +17,7 @@ class TestExtort extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Basilica Guards", 1);
         addToHand(P, "Basilica Screecher", 1);
         addToHand(P, "Blind Obedience", 1);
@@ -30,7 +30,7 @@ class TestExtort extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Grizzly Bears", 1);
         addToHand(P, "Manalith", 1);
 
diff --git a/src/magic/test/TestFlashfreeze.java b/src/magic/test/TestFlashfreeze.java
index 803e3bcd31..6911c6fbdc 100644
--- a/src/magic/test/TestFlashfreeze.java
+++ b/src/magic/test/TestFlashfreeze.java
@@ -23,7 +23,7 @@ class TestFlashfreeze extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(0);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Flashfreeze",3);
 
 
@@ -32,8 +32,8 @@ class TestFlashfreeze extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(0);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,5);
-        createPermanent(game,P,"Tectonic Edge",false,3);
+        createPermanent(P,"Rupture Spire",false,5);
+        createPermanent(P,"Tectonic Edge",false,3);
         addToHand(P,"Llanowar Elves", 1);
         addToHand(P,"Mogg Fanatic", 1);
         addToHand(P,"Prickly Boggart", 1);
diff --git a/src/magic/test/TestFlow.java b/src/magic/test/TestFlow.java
index 393249d51e..65d9eca227 100644
--- a/src/magic/test/TestFlow.java
+++ b/src/magic/test/TestFlow.java
@@ -18,9 +18,9 @@ class TestFlow extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(0);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        //createPermanent(game,P,"Grizzly Bears",false,1);
-        createPermanent(game,P,"Chameleon Colossus",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        //createPermanent(P,"Grizzly Bears",false,1);
+        createPermanent(P,"Chameleon Colossus",false,1);
 
 
         P = opponent;
@@ -28,9 +28,9 @@ class TestFlow extends TestGameBuilder {
         P.setLife(2);
         P.setPoison(0);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,5);
-        createPermanent(game,P,"Tectonic Edge",false,3);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,5);
+        createPermanent(P,"Tectonic Edge",false,3);
+        createPermanent(P,"Grizzly Bears",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestFreeSpells.java b/src/magic/test/TestFreeSpells.java
index 0ceae298d1..c577628416 100644
--- a/src/magic/test/TestFreeSpells.java
+++ b/src/magic/test/TestFreeSpells.java
@@ -17,9 +17,9 @@ class TestFreeSpells extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,10);
-        createPermanent(game,P,"Chromatic Lantern");
-        createPermanent(game,P,"Maelstrom Archangel");
+        createPermanent(P,"Plains",false,10);
+        createPermanent(P,"Chromatic Lantern");
+        createPermanent(P,"Maelstrom Archangel");
         addToHand(P,"Isochron Scepter",1);
         addToHand(P,"Spellbinder",1);
         addToHand(P,"Altar's Reap",1);
@@ -32,7 +32,7 @@ class TestFreeSpells extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestFrostTitan.java b/src/magic/test/TestFrostTitan.java
index 0ecac9029c..90033c730e 100644
--- a/src/magic/test/TestFrostTitan.java
+++ b/src/magic/test/TestFrostTitan.java
@@ -17,7 +17,7 @@ class TestFrostTitan extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Lightning Bolt",3);
         addToHand(P,"Vines of Vastwood",1);
         addToHand(P,"Frost Titan",3);
@@ -27,11 +27,11 @@ class TestFrostTitan extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,2);
-        createPermanent(game,P,"Phyrexian Crusader",true,1);
-        createPermanent(game,P,"Frost Titan",true,1);
-        createPermanent(game,P,"Frost Titan",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,2);
+        createPermanent(P,"Phyrexian Crusader",true,1);
+        createPermanent(P,"Frost Titan",true,1);
+        createPermanent(P,"Frost Titan",false,1);
         //addToHand(P,"Lightning Bolt",3);
 
         return game;
diff --git a/src/magic/test/TestGGvRR.java b/src/magic/test/TestGGvRR.java
index d2efec05bd..a506f1a847 100644
--- a/src/magic/test/TestGGvRR.java
+++ b/src/magic/test/TestGGvRR.java
@@ -20,17 +20,17 @@ class TestGGvRR extends TestGameBuilder {
 
         player.setLife(1);
         addToLibrary(player,"Plains",10);
-        createPermanent(game,player,"Rupture Spire",false,8);
-        createPermanent(game,player,"Raging Ravine",false,1);
-        createPermanent(game,player,"Giant Spider",false,1);
-        //createPermanent(game,player,"Esper Stormblade",false,1);
-        createPermanent(game,player,"Naya Hushblade",false,1);
-        //createPermanent(game,player,"Godsire",false,1);
-        //createPermanent(game,player,"Murderous Redcap",false,1);
+        createPermanent(player,"Rupture Spire",false,8);
+        createPermanent(player,"Raging Ravine",false,1);
+        createPermanent(player,"Giant Spider",false,1);
+        //createPermanent(player,"Esper Stormblade",false,1);
+        createPermanent(player,"Naya Hushblade",false,1);
+        //createPermanent(player,"Godsire",false,1);
+        //createPermanent(player,"Murderous Redcap",false,1);
 
         opponent.setLife(1);
         addToLibrary(opponent,"Island",10);
-        createPermanent(game,opponent,"Guardian of the Guildpact",false,5);
+        createPermanent(opponent,"Guardian of the Guildpact",false,5);
 
         return game;
     }
diff --git a/src/magic/test/TestGainControl.java b/src/magic/test/TestGainControl.java
index 22966b7396..13b4acbee2 100644
--- a/src/magic/test/TestGainControl.java
+++ b/src/magic/test/TestGainControl.java
@@ -17,11 +17,11 @@ class TestGainControl extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Creeping Tar Pit",false,1);
-        createPermanent(game,P,"Raging Ravine",false,1);
-        createPermanent(game,P,"Memnarch",false,1);
-        createPermanent(game,P,"Grizzly Bears",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Creeping Tar Pit",false,1);
+        createPermanent(P,"Raging Ravine",false,1);
+        createPermanent(P,"Memnarch",false,1);
+        createPermanent(P,"Grizzly Bears",false,3);
         addToHand(P,"Act of Treason",1);
         addToHand(P,"Threaten",1);
         addToHand(P,"Slave of Bolas",1);
@@ -38,9 +38,9 @@ class TestGainControl extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,3);
-        createPermanent(game,P,"Helm of Kaldra",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,3);
+        createPermanent(P,"Helm of Kaldra",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestGainLoseLife.java b/src/magic/test/TestGainLoseLife.java
index 8046a9736f..a46ec52dc4 100644
--- a/src/magic/test/TestGainLoseLife.java
+++ b/src/magic/test/TestGainLoseLife.java
@@ -17,7 +17,7 @@ class TestGainLoseLife extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Lone Missionary",1);
         addToHand(P,"Foul Imp",1);
 
@@ -26,7 +26,7 @@ class TestGainLoseLife extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestGameBuilder.java b/src/magic/test/TestGameBuilder.java
index 67ecabcd41..6086034cd7 100644
--- a/src/magic/test/TestGameBuilder.java
+++ b/src/magic/test/TestGameBuilder.java
@@ -51,8 +51,8 @@ public abstract class TestGameBuilder {
         }
     }
 
-    public static MagicPermanent createPermanent(final MagicGame game, final MagicPlayer player, final String name, final boolean tapped, final int count) {
-
+    public static MagicPermanent createPermanent(final MagicPlayer player, final String name, final boolean tapped, final int count) {
+        final MagicGame game = player.getGame();
         final MagicCardDefinition cardDefinition=CardDefinitions.getCard(name);
         MagicPermanent lastPermanent= MagicPermanent.NONE;
         for (int c=count;c>0;c--) {
@@ -80,12 +80,12 @@ public abstract class TestGameBuilder {
         return lastPermanent;
     }
     
-    public static MagicPermanent createPermanent(final MagicGame game,final MagicPlayer player,final String name,final int amount){
-        return createPermanent(game,player,name,false,amount);
+    public static MagicPermanent createPermanent(final MagicPlayer player,final String name,final int amount){
+        return createPermanent(player,name,false,amount);
     }
     
-    public static MagicPermanent createPermanent(final MagicGame game,final MagicPlayer player,final String name){
-        return createPermanent(game,player,name,false,1);
+    public static MagicPermanent createPermanent(final MagicPlayer player,final String name){
+        return createPermanent(player,name,false,1);
     }
 
     protected abstract MagicGame getGame();
diff --git a/src/magic/test/TestGethsVerdict.java b/src/magic/test/TestGethsVerdict.java
index 5ed15a6e3e..723a207587 100644
--- a/src/magic/test/TestGethsVerdict.java
+++ b/src/magic/test/TestGethsVerdict.java
@@ -17,8 +17,8 @@ class TestGethsVerdict extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,1);
         addToHand(P,"Geth's Verdict",1);
         addToHand(P,"Gatekeeper of Malakir",1);
 
@@ -27,8 +27,8 @@ class TestGethsVerdict extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,1);
         addToHand(P,"Geth's Verdict",1);
         addToHand(P,"Gatekeeper of Malakir",1);
 
diff --git a/src/magic/test/TestGhostCouncil.java b/src/magic/test/TestGhostCouncil.java
index 3cd2819a15..760823ebd4 100644
--- a/src/magic/test/TestGhostCouncil.java
+++ b/src/magic/test/TestGhostCouncil.java
@@ -17,14 +17,14 @@ class TestGhostCouncil extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P,"Swamp",10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Ghost Council of Orzhova",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Ghost Council of Orzhova",false,1);
 
         P = player;
 
         P.setLife(5);
         addToLibrary(P,"Mountain",10);
-        createPermanent(game,P,"Mountain",false,4);
+        createPermanent(P,"Mountain",false,4);
         addToHand(P,"Act of Treason",1);
 
         return game;
diff --git a/src/magic/test/TestGigadrowse.java b/src/magic/test/TestGigadrowse.java
index 96b17cb162..ecda44be39 100644
--- a/src/magic/test/TestGigadrowse.java
+++ b/src/magic/test/TestGigadrowse.java
@@ -17,8 +17,8 @@ class TestGigadrowse extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,1);
         addToHand(P,"Gigadrowse",1);
 
 
@@ -26,8 +26,8 @@ class TestGigadrowse extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestGoForTheThroat.java b/src/magic/test/TestGoForTheThroat.java
index 49935e75bd..fe9bd61494 100644
--- a/src/magic/test/TestGoForTheThroat.java
+++ b/src/magic/test/TestGoForTheThroat.java
@@ -17,16 +17,16 @@ class TestGoForTheThroat extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P,"Go for the Throat",1);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestGodhead.java b/src/magic/test/TestGodhead.java
index 3216db68bb..d6988be076 100644
--- a/src/magic/test/TestGodhead.java
+++ b/src/magic/test/TestGodhead.java
@@ -17,17 +17,17 @@ class TestGodhead extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Godhead of Awe", false, 1);
-        createPermanent(game,P,"Yavimaya Wurm", false, 1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Godhead of Awe", false, 1);
+        createPermanent(P,"Yavimaya Wurm", false, 1);
 
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Zephyr Sprite",false,7);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Zephyr Sprite",false,7);
 
         return game;
     }
diff --git a/src/magic/test/TestGraft.java b/src/magic/test/TestGraft.java
index 1211ec7f81..e3ed78be8f 100644
--- a/src/magic/test/TestGraft.java
+++ b/src/magic/test/TestGraft.java
@@ -18,9 +18,9 @@ class TestGraft extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Island", 10);
-        createPermanent(game,P,"Llanowar Reborn",false,2);
-        createPermanent(game,P,"Island",false,1);
-        createPermanent(game,P,"Forest",false,2);
+        createPermanent(P,"Llanowar Reborn",false,2);
+        createPermanent(P,"Island",false,1);
+        createPermanent(P,"Forest",false,2);
         addToHand(P, "Ethereal Ambush", 1);
 
         P = opponent;
diff --git a/src/magic/test/TestGrandColiseum.java b/src/magic/test/TestGrandColiseum.java
index 93d960c280..c2b3a63806 100644
--- a/src/magic/test/TestGrandColiseum.java
+++ b/src/magic/test/TestGrandColiseum.java
@@ -18,14 +18,14 @@ class TestGrandColiseum extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Grand Coliseum",false,8);
+        createPermanent(P,"Grand Coliseum",false,8);
         addToHand(P,"Grizzly Bears",1);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Grand Coliseum",false,8);
+        createPermanent(P,"Grand Coliseum",false,8);
         addToHand(P,"Grizzly Bears",1);
 
         return game;
diff --git a/src/magic/test/TestGraveBetrayal.java b/src/magic/test/TestGraveBetrayal.java
index 9fa0c2dd84..afa1019fde 100644
--- a/src/magic/test/TestGraveBetrayal.java
+++ b/src/magic/test/TestGraveBetrayal.java
@@ -17,8 +17,8 @@ class TestGraveBetrayal extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Mountain",false,8);
-        createPermanent(game,P,"Grave Betrayal",false,1);
+        createPermanent(P,"Mountain",false,8);
+        createPermanent(P,"Grave Betrayal",false,1);
         addToHand(P, "Scavenging Ooze", 1);
         addToHand(P, "Lightning Bolt", 1);
         addToHand(P, "Rise of the Hobgoblins", 3);
@@ -27,7 +27,7 @@ class TestGraveBetrayal extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Mountain",false,9);
+        createPermanent(P,"Mountain",false,9);
         addToHand(P, "Rise of the Hobgoblins", 3);
 
         return game;
diff --git a/src/magic/test/TestGuiltyConscienceStuffyDoll.java b/src/magic/test/TestGuiltyConscienceStuffyDoll.java
index 6b13d03f9c..3838e69c6c 100644
--- a/src/magic/test/TestGuiltyConscienceStuffyDoll.java
+++ b/src/magic/test/TestGuiltyConscienceStuffyDoll.java
@@ -17,15 +17,15 @@ class TestGuiltyConscienceStuffyDoll extends TestGameBuilder {
 
         P.setLife(5);
         addToLibrary(P, "Swamp", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P,"Stuffy Doll",false,1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P,"Stuffy Doll",false,1);
         addToHand(P, "Guilty Conscience", 1);
 
         P = opponent;
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
+        createPermanent(P,"Rupture Spire",false,9);
         addToHand(P, "Grizzly Bears", 2);
 
         return game;
diff --git a/src/magic/test/TestHexproof.java b/src/magic/test/TestHexproof.java
index c99de03739..ceb67d4a9d 100644
--- a/src/magic/test/TestHexproof.java
+++ b/src/magic/test/TestHexproof.java
@@ -15,16 +15,16 @@ class TestHexproof extends TestGameBuilder {
 
         player.setLife(1);
         addToLibrary(player,"Plains",10);
-        createPermanent(game,player,"Mountain",false,8);
-        createPermanent(game,player,"Thrun, the Last Troll",false,1);
-        createPermanent(game,player,"Silhana Ledgewalker",false,1);
-        createPermanent(game,player,"Troll Ascetic",false,1);
-        createPermanent(game,player,"Sacred Wolf",false,1);
+        createPermanent(player,"Mountain",false,8);
+        createPermanent(player,"Thrun, the Last Troll",false,1);
+        createPermanent(player,"Silhana Ledgewalker",false,1);
+        createPermanent(player,"Troll Ascetic",false,1);
+        createPermanent(player,"Sacred Wolf",false,1);
         addToHand(player,"Lightning Bolt",3);
 
         opponent.setLife(1);
         addToLibrary(opponent,"Island",10);
-        createPermanent(game,opponent,"Mountain",false,8);
+        createPermanent(opponent,"Mountain",false,8);
         addToHand(opponent,"Lightning Bolt",3);
 
         return game;
diff --git a/src/magic/test/TestHoBBCoF.java b/src/magic/test/TestHoBBCoF.java
index 0abc0dabbd..b30b2cac7f 100644
--- a/src/magic/test/TestHoBBCoF.java
+++ b/src/magic/test/TestHoBBCoF.java
@@ -17,16 +17,16 @@ class TestHoBBCoF extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Hero of Bladehold",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Hero of Bladehold",false,1);
 
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Circle of Flame",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Circle of Flame",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestHowlingBlack.java b/src/magic/test/TestHowlingBlack.java
index 6e8f9ffa4d..3729841537 100644
--- a/src/magic/test/TestHowlingBlack.java
+++ b/src/magic/test/TestHowlingBlack.java
@@ -17,15 +17,15 @@ class TestHowlingBlack extends TestGameBuilder {
 
         P.setLife(5);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Howling Mine",false,1);
-        createPermanent(game,P,"Black Vise",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Howling Mine",false,1);
+        createPermanent(P,"Black Vise",false,1);
 
         P = opponent;
 
         P.setLife(5);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestInfiltrationLens.java b/src/magic/test/TestInfiltrationLens.java
index 61930cebb3..cd75744f4c 100644
--- a/src/magic/test/TestInfiltrationLens.java
+++ b/src/magic/test/TestInfiltrationLens.java
@@ -17,16 +17,16 @@ class TestInfiltrationLens extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sphinx of Lost Truths",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sphinx of Lost Truths",false,1);
         addToHand(P, "Infiltration Lens", 1);
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Angelic Wall",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Angelic Wall",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestInkmothNexus.java b/src/magic/test/TestInkmothNexus.java
index 61799ff02e..1349af4dc5 100644
--- a/src/magic/test/TestInkmothNexus.java
+++ b/src/magic/test/TestInkmothNexus.java
@@ -23,7 +23,7 @@ class TestInkmothNexus extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Inkmoth Nexus",1);
         addToHand(P,"Stonework Puma",1);
 
@@ -33,7 +33,7 @@ class TestInkmothNexus extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Stonework Puma",1);
         addToHand(P,"Llanowar Elves", 1);
         addToHand(P,"Prickly Boggart", 1);
diff --git a/src/magic/test/TestKarnsTouch.java b/src/magic/test/TestKarnsTouch.java
index 3b1ceea4c1..12ec9f0614 100644
--- a/src/magic/test/TestKarnsTouch.java
+++ b/src/magic/test/TestKarnsTouch.java
@@ -17,9 +17,9 @@ class TestKarnsTouch extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Forest",false,8);
-        createPermanent(game,P,"Chromatic Lantern",false,1);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Forest",false,8);
+        createPermanent(P,"Chromatic Lantern",false,1);
+        createPermanent(P,"Phyrexian Crusader",false,3);
         addToHand(P, "Batterskull", 1);
         addToHand(P, "Flayer Husk", 1);
         addToHand(P, "Karn's Touch", 1);
@@ -29,8 +29,8 @@ class TestKarnsTouch extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestKederektParasite.java b/src/magic/test/TestKederektParasite.java
index 70fc678558..e9f502897a 100644
--- a/src/magic/test/TestKederektParasite.java
+++ b/src/magic/test/TestKederektParasite.java
@@ -18,7 +18,7 @@ class TestKederektParasite extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Mountain", 10);
-        createPermanent(game,P,"Kederekt Parasite",false,4);
+        createPermanent(P,"Kederekt Parasite",false,4);
         addToHand(P,"Mogg Fanatic",3);
         addToHand(P,"Rakdos Guildmage",3);
 
@@ -27,7 +27,7 @@ class TestKederektParasite extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Mountain", 10);
-        createPermanent(game,P,"Kederekt Parasite",false,4);
+        createPermanent(P,"Kederekt Parasite",false,4);
         addToHand(P,"Mogg Fanatic",3);
         addToHand(P,"Rakdos Guildmage",3);
 
diff --git a/src/magic/test/TestKessigWolfRun.java b/src/magic/test/TestKessigWolfRun.java
index 8fe83e55db..33942c4bf4 100644
--- a/src/magic/test/TestKessigWolfRun.java
+++ b/src/magic/test/TestKessigWolfRun.java
@@ -17,16 +17,16 @@ class TestKessigWolfRun extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Mountain",false,1);
-        createPermanent(game,P,"Forest",false,1);
-        createPermanent(game,P,"Kessig Wolf Run",false,1);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Mountain",false,1);
+        createPermanent(P,"Forest",false,1);
+        createPermanent(P,"Kessig Wolf Run",false,1);
+        createPermanent(P,"Grizzly Bears",false,1);
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestKicker.java b/src/magic/test/TestKicker.java
index 8c245ef63e..4197196a88 100644
--- a/src/magic/test/TestKicker.java
+++ b/src/magic/test/TestKicker.java
@@ -18,8 +18,8 @@ class TestKicker extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P,"Ravaging Riftwurm",1);
         addToHand(P,"Sphinx of Lost Truths",1);
         addToHand(P,"Wolfbriar Elemental",1);
@@ -36,8 +36,8 @@ class TestKicker extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P, "Plains", 7);
 
         return game;
diff --git a/src/magic/test/TestKikiRestoration.java b/src/magic/test/TestKikiRestoration.java
index 58c651a7a2..81d082516c 100644
--- a/src/magic/test/TestKikiRestoration.java
+++ b/src/magic/test/TestKikiRestoration.java
@@ -17,13 +17,13 @@ class TestKikiRestoration extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Kiki-Jiki, Mirror Breaker",1);
         addToHand(P,"Restoration Angel",1);
 
diff --git a/src/magic/test/TestKodamaCenterTree.java b/src/magic/test/TestKodamaCenterTree.java
index ca088d303a..08f02f7662 100644
--- a/src/magic/test/TestKodamaCenterTree.java
+++ b/src/magic/test/TestKodamaCenterTree.java
@@ -17,14 +17,14 @@ class TestKodamaCenterTree extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Forest",false,1);
-        createPermanent(game,P,"Kodama of the Center Tree",false,5);
+        createPermanent(P,"Forest",false,1);
+        createPermanent(P,"Kodama of the Center Tree",false,5);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Lightning Bolt", 3);
 
         return game;
diff --git a/src/magic/test/TestKorFirewalker.java b/src/magic/test/TestKorFirewalker.java
index 17ceb3737c..fe301d4308 100644
--- a/src/magic/test/TestKorFirewalker.java
+++ b/src/magic/test/TestKorFirewalker.java
@@ -22,7 +22,7 @@ class TestKorFirewalker extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Kor Firewalker",3);
         addToHand(P,"Lightning Bolt",3);
 
@@ -31,8 +31,8 @@ class TestKorFirewalker extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader", false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader", false,1);
         addToHand(P,"Lightning Bolt",3);
 
         return game;
diff --git a/src/magic/test/TestLegacysAllure.java b/src/magic/test/TestLegacysAllure.java
index 3ecb5c6bdc..fbb3e7dddb 100644
--- a/src/magic/test/TestLegacysAllure.java
+++ b/src/magic/test/TestLegacysAllure.java
@@ -17,8 +17,8 @@ class TestLegacysAllure extends TestGameBuilder {
 
         P.setLife(9);
         addToLibrary(P, "Plains", 20);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Legacy's Allure",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Legacy's Allure",false,1);
         addToHand(P,"Giant Growth",1);
 
 
@@ -26,8 +26,8 @@ class TestLegacysAllure extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 20);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Steward of Valeron",false,2);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Steward of Valeron",false,2);
 
         return game;
     }
diff --git a/src/magic/test/TestLegendaries.java b/src/magic/test/TestLegendaries.java
index 5c14c77e1d..ae8c4a29c4 100644
--- a/src/magic/test/TestLegendaries.java
+++ b/src/magic/test/TestLegendaries.java
@@ -17,16 +17,16 @@ class TestLegendaries extends TestGameBuilder {
 
         P.setLife(9);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game, P, "Karakas", false, 1);
-        createPermanent(game, P, "Kor Haven", false, 1);
-        createPermanent(game, P, "Maze of Ith", false, 1);
-        createPermanent(game, P, "Mikokoro, Center of the Sea", false, 1);
-        createPermanent(game, P, "Miren, the Moaning Well", false, 1);
-        createPermanent(game, P, "Okina, Temple to the Grandfathers", false, 1);
-        createPermanent(game, P, "Azusa, Lost but Seeking", false, 1);
-        createPermanent(game, P, "Captain Sisay", false, 1);
-        createPermanent(game, P, "Knight of the Reliquary", false, 1);
-        createPermanent(game, P, "Kokusho, the Evening Star", false, 1);
+        createPermanent(P, "Karakas", false, 1);
+        createPermanent(P, "Kor Haven", false, 1);
+        createPermanent(P, "Maze of Ith", false, 1);
+        createPermanent(P, "Mikokoro, Center of the Sea", false, 1);
+        createPermanent(P, "Miren, the Moaning Well", false, 1);
+        createPermanent(P, "Okina, Temple to the Grandfathers", false, 1);
+        createPermanent(P, "Azusa, Lost but Seeking", false, 1);
+        createPermanent(P, "Captain Sisay", false, 1);
+        createPermanent(P, "Knight of the Reliquary", false, 1);
+        createPermanent(P, "Kokusho, the Evening Star", false, 1);
         addToHand(P, "Kor Haven", 1);
         addToHand(P, "Maze of Ith", 1);
         addToHand(P, "Mikokoro, Center of the Sea", 1);
@@ -38,16 +38,16 @@ class TestLegendaries extends TestGameBuilder {
 
         P.setLife(9);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game, P, "Karakas", false, 1);
-        createPermanent(game, P, "Kor Haven", false, 1);
-        createPermanent(game, P, "Maze of Ith", false, 1);
-        createPermanent(game, P, "Mikokoro, Center of the Sea", false, 1);
-        createPermanent(game, P, "Miren, the Moaning Well", false, 1);
-        createPermanent(game, P, "Okina, Temple to the Grandfathers", false, 1);
-        createPermanent(game, P, "Azusa, Lost but Seeking", false, 1);
-        createPermanent(game, P, "Captain Sisay", false, 1);
-        createPermanent(game, P, "Knight of the Reliquary", false, 1);
-        createPermanent(game, P, "Kokusho, the Evening Star", false, 1);
+        createPermanent(P, "Karakas", false, 1);
+        createPermanent(P, "Kor Haven", false, 1);
+        createPermanent(P, "Maze of Ith", false, 1);
+        createPermanent(P, "Mikokoro, Center of the Sea", false, 1);
+        createPermanent(P, "Miren, the Moaning Well", false, 1);
+        createPermanent(P, "Okina, Temple to the Grandfathers", false, 1);
+        createPermanent(P, "Azusa, Lost but Seeking", false, 1);
+        createPermanent(P, "Captain Sisay", false, 1);
+        createPermanent(P, "Knight of the Reliquary", false, 1);
+        createPermanent(P, "Kokusho, the Evening Star", false, 1);
         addToHand(P, "Kor Haven", 1);
         addToHand(P, "Maze of Ith", 1);
         addToHand(P, "Mikokoro, Center of the Sea", 1);
diff --git a/src/magic/test/TestLivingWeapon.java b/src/magic/test/TestLivingWeapon.java
index 4a2a32cf2b..0e679b5690 100644
--- a/src/magic/test/TestLivingWeapon.java
+++ b/src/magic/test/TestLivingWeapon.java
@@ -17,14 +17,14 @@ class TestLivingWeapon extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Flayer Husk", 1);
 
         P = opponent;
 
         P.setLife(5);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestLoxodonSmiter.java b/src/magic/test/TestLoxodonSmiter.java
index fa5828ecac..9d78fbfccb 100644
--- a/src/magic/test/TestLoxodonSmiter.java
+++ b/src/magic/test/TestLoxodonSmiter.java
@@ -17,7 +17,7 @@ class TestLoxodonSmiter extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
+        createPermanent(P,"Rupture Spire",false,9);
         addToHand(P, "Loxodon Smiter", 1);
         addToHand(P, "Lightning Bolt", 1);
 
@@ -25,7 +25,7 @@ class TestLoxodonSmiter extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
+        createPermanent(P,"Rupture Spire",false,9);
         addToHand(P, "Dismal Failure", 2);
 
         return game;
diff --git a/src/magic/test/TestLudevic.java b/src/magic/test/TestLudevic.java
index a868349650..3e54e6d07a 100644
--- a/src/magic/test/TestLudevic.java
+++ b/src/magic/test/TestLudevic.java
@@ -17,8 +17,8 @@ class TestLudevic extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game, P, "Ludevic's Test Subject", false, 1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P, "Ludevic's Test Subject", false, 1);
         addToHand(P,"Chronozoa",1);
         addToHand(P,"Intangible Virtue",1);
         addToHand(P,"Twilight Drover",1);
@@ -28,7 +28,7 @@ class TestLudevic extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestMCTS.java b/src/magic/test/TestMCTS.java
index 4144f039f5..6f7038ae7b 100644
--- a/src/magic/test/TestMCTS.java
+++ b/src/magic/test/TestMCTS.java
@@ -17,18 +17,18 @@ class TestMCTS extends TestGameBuilder {
 
         P.setLife(4);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Hearthfire Hobgoblin", false, 4);
-        createPermanent(game,P,"Akrasan Squire", false, 4);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Hearthfire Hobgoblin", false, 4);
+        createPermanent(P,"Akrasan Squire", false, 4);
 
 
         P = opponent;
 
         P.setLife(4);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Hearthfire Hobgoblin", false, 4);
-        createPermanent(game,P,"Akrasan Squire", false, 4);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Hearthfire Hobgoblin", false, 4);
+        createPermanent(P,"Akrasan Squire", false, 4);
 
         return game;
     }
diff --git a/src/magic/test/TestMCTSCrash.java b/src/magic/test/TestMCTSCrash.java
index 615811924a..b140d54219 100644
--- a/src/magic/test/TestMCTSCrash.java
+++ b/src/magic/test/TestMCTSCrash.java
@@ -17,9 +17,9 @@ class TestMCTSCrash extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sword of Feast and Famine",false,2);
-        createPermanent(game,P,"Marisi's Twinclaws",false, 2);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sword of Feast and Famine",false,2);
+        createPermanent(P,"Marisi's Twinclaws",false, 2);
 
 
         P = opponent;
@@ -27,9 +27,9 @@ class TestMCTSCrash extends TestGameBuilder {
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
         addToHand(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Mogg Fanatic", false, 1);
-        createPermanent(game,P,"Knight of Meadowgrain", false, 2);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Mogg Fanatic", false, 1);
+        createPermanent(P,"Knight of Meadowgrain", false, 2);
 
         return game;
     }
diff --git a/src/magic/test/TestManaChoice.java b/src/magic/test/TestManaChoice.java
index 0725c891af..e31d98c33c 100644
--- a/src/magic/test/TestManaChoice.java
+++ b/src/magic/test/TestManaChoice.java
@@ -17,11 +17,11 @@ class TestManaChoice extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Abandoned Outpost",false,1);
-        //createPermanent(game,P,"Bog Wreckage",false,1);
-        createPermanent(game,P,"Ravaged Highlands",false,1);
-        createPermanent(game,P,"Seafloor Debris",false,1);
-        createPermanent(game,P,"Timberland Ruins",false,1);
+        createPermanent(P,"Abandoned Outpost",false,1);
+        //createPermanent(P,"Bog Wreckage",false,1);
+        createPermanent(P,"Ravaged Highlands",false,1);
+        createPermanent(P,"Seafloor Debris",false,1);
+        createPermanent(P,"Timberland Ruins",false,1);
         addToHand(P, "Gemstone Mine", 1);
         addToHand(P, "Fusion Elemental", 1);
 
@@ -29,7 +29,7 @@ class TestManaChoice extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestManifest.java b/src/magic/test/TestManifest.java
index 3271ef33d7..01ba9104e5 100644
--- a/src/magic/test/TestManifest.java
+++ b/src/magic/test/TestManifest.java
@@ -20,15 +20,15 @@ class TestManifest extends TestGameBuilder {
         P.setLife(10);
         addToLibrary(P, "Wolf-Skull Shaman", 1);
         addToLibrary(P, "Carrion Crow", 1);
-        createPermanent(game,P, "Plains", false, 8);
-        createPermanent(game,P, "Chromatic Lantern", false, 1);
+        createPermanent(P, "Plains", false, 8);
+        createPermanent(P, "Chromatic Lantern", false, 1);
         addToHand(P, "Ethereal Ambush", 1);
 
         P = opponent;
 
         P.setLife(10);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P, "Grizzly Bears", false, 1);
 
         return game;
     }
diff --git a/src/magic/test/TestMarch.java b/src/magic/test/TestMarch.java
index b2f6961ddc..e6a1ae24ff 100644
--- a/src/magic/test/TestMarch.java
+++ b/src/magic/test/TestMarch.java
@@ -17,9 +17,9 @@ class TestMarch extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Island", 10);
-        createPermanent(game,P,"Island",false,8);
-        createPermanent(game,P,"Chimeric Staff",false,1);
-        createPermanent(game,P,"Seat of the Synod",false,1);
+        createPermanent(P,"Island",false,8);
+        createPermanent(P,"Chimeric Staff",false,1);
+        createPermanent(P,"Seat of the Synod",false,1);
         addToHand(P,"Master of Etherium",1);
         addToHand(P,"March of the Machines",1);
 
@@ -28,7 +28,7 @@ class TestMarch extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestMindRavel.java b/src/magic/test/TestMindRavel.java
index 12293d4e5c..7ed18db98a 100644
--- a/src/magic/test/TestMindRavel.java
+++ b/src/magic/test/TestMindRavel.java
@@ -20,15 +20,15 @@ class TestMindRavel extends TestGameBuilder {
         P.setLife(13);
         addToLibrary(P, "Lightning Bolt", 10);
         addToGraveyard(P, "Lightning Bolt", 1);
-        createPermanent(game,P, "Mountain", false, 8);
-        createPermanent(game,P, "Chromatic Lantern", false, 1);
+        createPermanent(P, "Mountain", false, 8);
+        createPermanent(P, "Chromatic Lantern", false, 1);
         addToHand(P, "Mind Ravel", 2);
 
         P = opponent;
 
         P.setLife(13);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P,"Forest",false,5);
+        createPermanent(P,"Forest",false,5);
         addToGraveyard(P, "Grizzly Bears", 1);
         addToHand(P, "Mind Ravel", 2);
 
diff --git a/src/magic/test/TestMindshrieker.java b/src/magic/test/TestMindshrieker.java
index c40b5dec99..abaa692ca9 100644
--- a/src/magic/test/TestMindshrieker.java
+++ b/src/magic/test/TestMindshrieker.java
@@ -17,7 +17,7 @@ class TestMindshrieker extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Mindshrieker",3);
         addToHand(P,"Wolfir Silverheart",3);
 
@@ -26,8 +26,8 @@ class TestMindshrieker extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Silverblade Paladin", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
         addToHand(P,"Silverblade Paladin",3);
 
         return game;
diff --git a/src/magic/test/TestMoM.java b/src/magic/test/TestMoM.java
index 9fed60964c..646df09afc 100644
--- a/src/magic/test/TestMoM.java
+++ b/src/magic/test/TestMoM.java
@@ -23,7 +23,7 @@ class TestMoM extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Mark of Mutiny",4);
 
 
@@ -32,7 +32,7 @@ class TestMoM extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Giant Spider",1);
         addToHand(P,"Birds of Paradise", 1);
         addToHand(P,"Sphere of the Suns",1);
diff --git a/src/magic/test/TestMorph.java b/src/magic/test/TestMorph.java
index a707db41aa..37641fe3b4 100644
--- a/src/magic/test/TestMorph.java
+++ b/src/magic/test/TestMorph.java
@@ -17,8 +17,8 @@ class TestMorph extends TestGameBuilder {
 
         P.setLife(5);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Thousand Winds", false, 3);
-        createPermanent(game,P, "Island", false, 6);
+        createPermanent(P, "Thousand Winds", false, 3);
+        createPermanent(P, "Island", false, 6);
         addToHand(P, "Backslide", 2);
 //        addToHand(P, "Lightning Bolt", 1);
 //        addToHand(P, "Ludevic's Test Subject", 2);
@@ -27,8 +27,8 @@ class TestMorph extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Forest", 20);
-//        createPermanent(game,P, "Island", false, 8);
-//        createPermanent(game,P, "Grizzly Bears", false, 1);
+//        createPermanent(P, "Island", false, 8);
+//        createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Ludevic's Test Subject", 2);
 
         return game;
diff --git a/src/magic/test/TestMothdust.java b/src/magic/test/TestMothdust.java
index 91b2bbf6c3..c37065a81d 100644
--- a/src/magic/test/TestMothdust.java
+++ b/src/magic/test/TestMothdust.java
@@ -17,9 +17,9 @@ class TestMothdust extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Mothdust Changeling",false,1);
-        createPermanent(game,P,"Fallowsage",false,4);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Mothdust Changeling",false,1);
+        createPermanent(P,"Fallowsage",false,4);
         addToHand(P,"Chronozoa",1);
         addToHand(P,"Intangible Virtue",1);
         addToHand(P,"Twilight Drover",1);
@@ -29,7 +29,7 @@ class TestMothdust extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestMoxOpal.java b/src/magic/test/TestMoxOpal.java
index 711ccb34e9..09078f80fc 100644
--- a/src/magic/test/TestMoxOpal.java
+++ b/src/magic/test/TestMoxOpal.java
@@ -23,7 +23,7 @@ class TestMoxOpal extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Sphere of the Suns",2);
         addToHand(P,"Mox Opal",2);
         addToHand(P,"Veteran Armorer",3);
@@ -34,7 +34,7 @@ class TestMoxOpal extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Stonework Puma",1);
         addToHand(P,"Llanowar Elves", 1);
         addToHand(P,"Prickly Boggart", 1);
diff --git a/src/magic/test/TestMultipleActivation.java b/src/magic/test/TestMultipleActivation.java
index 9f2419034c..02a2d938ea 100644
--- a/src/magic/test/TestMultipleActivation.java
+++ b/src/magic/test/TestMultipleActivation.java
@@ -18,14 +18,14 @@ class TestMultipleActivation extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P,"Swamp",10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Nantuko Shade",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Nantuko Shade",false,1);
 
         P = player;
 
         P.setLife(10);
         addToLibrary(P,"Swamp",10);
-        createPermanent(game,P,"Swamp",true,10);
+        createPermanent(P,"Swamp",true,10);
         addToHand(P,"Wall of Reverence",1);
         addToHand(P,"Skithiryx, the Blight Dragon",1);
 
diff --git a/src/magic/test/TestMutavault.java b/src/magic/test/TestMutavault.java
index 36efb58ceb..5bc9f80214 100644
--- a/src/magic/test/TestMutavault.java
+++ b/src/magic/test/TestMutavault.java
@@ -19,7 +19,7 @@ class TestMutavault extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,1);
+        createPermanent(P,"Rupture Spire",false,1);
         addToHand(P,"Mutavault",2);
 
 
@@ -28,8 +28,8 @@ class TestMutavault extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,3);
-        createPermanent(game,P,"Tectonic Edge",false,3);
+        createPermanent(P,"Rupture Spire",false,3);
+        createPermanent(P,"Tectonic Edge",false,3);
         addToHand(P,"Vines of Vastwood",1);
         addToHand(P,"Inkwell Leviathan",1);
 
diff --git a/src/magic/test/TestMycoloth.java b/src/magic/test/TestMycoloth.java
index c4666ab0f9..7dbd12e343 100644
--- a/src/magic/test/TestMycoloth.java
+++ b/src/magic/test/TestMycoloth.java
@@ -17,8 +17,8 @@ class TestMycoloth extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,1);
         addToHand(P,"Mycoloth",1);
 
 
@@ -26,8 +26,8 @@ class TestMycoloth extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestNPH.java b/src/magic/test/TestNPH.java
index c70e0f4feb..b20a3a3d49 100644
--- a/src/magic/test/TestNPH.java
+++ b/src/magic/test/TestNPH.java
@@ -33,11 +33,11 @@ class TestNPH extends TestGameBuilder {
         addToHand(player,"Urabrask the Hidden",1);
         addToHand(player,"Sickleslicer",1);
 
-        createPermanent(game,player,"Raging Goblin",false,1);
-        createPermanent(game,player,"Bonesplitter",false,1);
-        createPermanent(game,player,"Rupture Spire",false,7);
-        createPermanent(game,opponent,"Bloodrock Cyclops",false,1);
-        createPermanent(game,opponent,"Silver Knight",false,1);
+        createPermanent(player,"Raging Goblin",false,1);
+        createPermanent(player,"Bonesplitter",false,1);
+        createPermanent(player,"Rupture Spire",false,7);
+        createPermanent(opponent,"Bloodrock Cyclops",false,1);
+        createPermanent(opponent,"Silver Knight",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestNantukoShade.java b/src/magic/test/TestNantukoShade.java
index 5dceb62b7d..41741dbcb4 100644
--- a/src/magic/test/TestNantukoShade.java
+++ b/src/magic/test/TestNantukoShade.java
@@ -18,15 +18,15 @@ class TestNantukoShade extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P,"Swamp",10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Nantuko Shade",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Nantuko Shade",false,1);
 
         P = player;
 
         P.setLife(5);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Plains",true,4);
-        //createPermanent(game,P,"Siege Mastodon",false,1);
+        createPermanent(P,"Plains",true,4);
+        //createPermanent(P,"Siege Mastodon",false,1);
         addToHand(P,"Wall of Reverence",1);
 
         return game;
diff --git a/src/magic/test/TestNaturesClaim.java b/src/magic/test/TestNaturesClaim.java
index dd85506107..4f5f500e90 100644
--- a/src/magic/test/TestNaturesClaim.java
+++ b/src/magic/test/TestNaturesClaim.java
@@ -22,7 +22,7 @@ class TestNaturesClaim extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Nature's Claim",3);
 
 
@@ -30,7 +30,7 @@ class TestNaturesClaim extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Signal Pest",3);
 
         return game;
diff --git a/src/magic/test/TestNoChoice.java b/src/magic/test/TestNoChoice.java
index d76d12e749..5e654189be 100644
--- a/src/magic/test/TestNoChoice.java
+++ b/src/magic/test/TestNoChoice.java
@@ -20,15 +20,15 @@ class TestNoChoice extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Vesper Ghoul", false, 1);
-        createPermanent(game,P, "Foul Familiar", false, 1);
+        createPermanent(P, "Vesper Ghoul", false, 1);
+        createPermanent(P, "Foul Familiar", false, 1);
         
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Forest", 20);
-        createPermanent(game,P, "Vesper Ghoul", false, 1);
-        createPermanent(game,P, "Foul Familiar", false, 1);
+        createPermanent(P, "Vesper Ghoul", false, 1);
+        createPermanent(P, "Foul Familiar", false, 1);
 
         return game;
     }
diff --git a/src/magic/test/TestNyxathid.java b/src/magic/test/TestNyxathid.java
index 210161aca5..bba872dc81 100644
--- a/src/magic/test/TestNyxathid.java
+++ b/src/magic/test/TestNyxathid.java
@@ -18,8 +18,8 @@ class TestNyxathid extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Mountain", 10);
-        createPermanent(game,P,"Rupture Spire",false,6);
-        createPermanent(game,P,"Nyxathid",false,1);
+        createPermanent(P,"Rupture Spire",false,6);
+        createPermanent(P,"Nyxathid",false,1);
         addToHand(P,"Eager Cadet",1);
 
 
@@ -27,8 +27,8 @@ class TestNyxathid extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Mountain", 10);
-        createPermanent(game,P,"Rupture Spire",false,6);
-        createPermanent(game,P,"Eager Cadet",false,1);
+        createPermanent(P,"Rupture Spire",false,6);
+        createPermanent(P,"Eager Cadet",false,1);
         addToHand(P,"Sift",1);
         addToHand(P,"Mountain",3);
 
diff --git a/src/magic/test/TestObstinateBaloth.java b/src/magic/test/TestObstinateBaloth.java
index ceecf506b1..98f647f44a 100644
--- a/src/magic/test/TestObstinateBaloth.java
+++ b/src/magic/test/TestObstinateBaloth.java
@@ -18,16 +18,16 @@ class TestObstinateBaloth extends TestGameBuilder {
         P.setLife(6);
         addToLibrary(P, "Forest", 20);
         addToLibrary(P, "Island", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 2);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 2);
         addToHand(P, "Mind Rot", 1);
 
         P = opponent;
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Blight Mamba", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Blight Mamba", false, 1);
         addToHand(P, "Obstinate Baloth", 2);
 
         return game;
diff --git a/src/magic/test/TestOona.java b/src/magic/test/TestOona.java
index 0bc8161db9..3a19a328e5 100644
--- a/src/magic/test/TestOona.java
+++ b/src/magic/test/TestOona.java
@@ -17,14 +17,14 @@ class TestOona extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
+        createPermanent(P,"Rupture Spire",false,9);
         addToHand(P, "Oona, Queen of the Fae", 1);
 
         P = opponent;
 
         P.setLife(5);
         addToLibrary(P, "Flailing Drake", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
+        createPermanent(P,"Rupture Spire",false,9);
         addToHand(P, "Flailing Drake", 2);
 
         return game;
diff --git a/src/magic/test/TestOverload.java b/src/magic/test/TestOverload.java
index 64756457bb..c773a6318b 100644
--- a/src/magic/test/TestOverload.java
+++ b/src/magic/test/TestOverload.java
@@ -17,8 +17,8 @@ class TestOverload extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,2);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,2);
         addToHand(P, "Blustersquall", 1);
         addToHand(P, "Chemister's Trick", 1);
         addToHand(P, "Counterflux", 1);
@@ -32,8 +32,8 @@ class TestOverload extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,2);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,2);
         addToHand(P, "Downsize", 1);
         addToHand(P, "Dynacharge", 1);
         addToHand(P, "Mizzium Skin", 1);
diff --git a/src/magic/test/TestPacifism.java b/src/magic/test/TestPacifism.java
index fadc5d0162..5bc3a5bc37 100644
--- a/src/magic/test/TestPacifism.java
+++ b/src/magic/test/TestPacifism.java
@@ -17,7 +17,7 @@ class TestPacifism extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Kor Firewalker",3);
         addToHand(P,"Pacifism",3);
 
@@ -26,8 +26,8 @@ class TestPacifism extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Alabaster Mage",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Alabaster Mage",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestParallaxNexus.java b/src/magic/test/TestParallaxNexus.java
index 78610c1dbf..fe7ff1c17e 100644
--- a/src/magic/test/TestParallaxNexus.java
+++ b/src/magic/test/TestParallaxNexus.java
@@ -17,14 +17,14 @@ class TestParallaxNexus extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Parallax Nexus", 1);
 
         P = opponent;
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Grizzly Bears", 1);
         addToHand(P, "Parallax Nexus", 1);
 
diff --git a/src/magic/test/TestPersistUndying.java b/src/magic/test/TestPersistUndying.java
index d3db2fd8be..4e1e6f97e4 100644
--- a/src/magic/test/TestPersistUndying.java
+++ b/src/magic/test/TestPersistUndying.java
@@ -17,8 +17,8 @@ class TestPersistUndying extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P,"Antler Skulkin",false,1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P,"Antler Skulkin",false,1);
         addToHand(P, "Murderous Redcap", 1);
         addToHand(P, "Vorapede", 1);
         addToHand(P, "Wingrattle Scarecrow", 1);
@@ -29,7 +29,7 @@ class TestPersistUndying extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Rendclaw Trow", 1);
         addToHand(P, "Young Wolf", 1);
 
diff --git a/src/magic/test/TestPhyrexianMana.java b/src/magic/test/TestPhyrexianMana.java
index 279d96a101..763eb61767 100644
--- a/src/magic/test/TestPhyrexianMana.java
+++ b/src/magic/test/TestPhyrexianMana.java
@@ -23,8 +23,8 @@ class TestPhyrexianMana extends TestGameBuilder {
         addToLibrary(P, "Sliver Overlord", 1);
         addToLibrary(P, "Wingsteed Rider", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 3);
-        createPermanent(game,P, "Rupture Spire", false, 9);
-        createPermanent(game,P, "Rhystic Study", false, 1);
+        createPermanent(P, "Rupture Spire", false, 9);
+        createPermanent(P, "Rhystic Study", false, 1);
         addToHand(P, "Rupture Spire", 1);
         addToHand(P, "Feast of Blood", 1);
         addToHand(P, "Lightning Bolt", 1);
@@ -35,7 +35,7 @@ class TestPhyrexianMana extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Forest", 20);
-        //createPermanent(game,P,"Rupture Spire",false,1);
+        //createPermanent(P,"Rupture Spire",false,1);
         addToHand(P, "Trained Jackal", 2);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
diff --git a/src/magic/test/TestPlaneswalker.java b/src/magic/test/TestPlaneswalker.java
index 3ab09aa54e..6ef6cba874 100644
--- a/src/magic/test/TestPlaneswalker.java
+++ b/src/magic/test/TestPlaneswalker.java
@@ -17,8 +17,8 @@ class TestPlaneswalker extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,10);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,10);
+        createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P, "Ajani, Caller of the Pride", 1);
         addToHand(P, "Sarkhan Vol", 1);
         addToHand(P, "Tamiyo, the Moon Sage", 1);
@@ -33,8 +33,8 @@ class TestPlaneswalker extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        //createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        //createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P, "Elspeth, Knight-Errant", 1);
         addToHand(P, "Ajani Goldmane", 1);
         addToHand(P, "Garruk, Primal Hunter", 1);
diff --git a/src/magic/test/TestPlatinumAngel.java b/src/magic/test/TestPlatinumAngel.java
index 6cbe1ed8a7..cf5615bd28 100644
--- a/src/magic/test/TestPlatinumAngel.java
+++ b/src/magic/test/TestPlatinumAngel.java
@@ -18,10 +18,10 @@ class TestPlatinumAngel extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Plains",false,2);
-        createPermanent(game,P,"Platinum Angel",false,1);
-        createPermanent(game,P,"Air Servant",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Plains",false,2);
+        createPermanent(P,"Platinum Angel",false,1);
+        createPermanent(P,"Air Servant",false,1);
         addToHand(P,"Doom Blade",2);
         addToHand(P,"Demystify",2);
         addToHand(P,"Stomping Ground",1);
@@ -31,10 +31,10 @@ class TestPlatinumAngel extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Plains",false,2);
-        createPermanent(game,P,"Platinum Angel",false,1);
-        createPermanent(game,P,"Alpha Myr",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Plains",false,2);
+        createPermanent(P,"Platinum Angel",false,1);
+        createPermanent(P,"Alpha Myr",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestPopulate.java b/src/magic/test/TestPopulate.java
index 4c37a2c0ac..737d9300e9 100644
--- a/src/magic/test/TestPopulate.java
+++ b/src/magic/test/TestPopulate.java
@@ -17,7 +17,7 @@ class TestPopulate extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Eyes in the Skies", 1);
         addToHand(P, "Trostani, Selesnya's Voice", 1);
         addToHand(P, "Vitu-Ghazi Guildmage", 1);
@@ -29,7 +29,7 @@ class TestPopulate extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Growing Ranks", 1);
         addToHand(P, "Rootborn Defenses", 1);
         addToHand(P, "Sundering Growth", 1);
diff --git a/src/magic/test/TestProtection.java b/src/magic/test/TestProtection.java
index 7d33d98a65..46f627edad 100644
--- a/src/magic/test/TestProtection.java
+++ b/src/magic/test/TestProtection.java
@@ -22,18 +22,18 @@ class TestProtection extends TestGameBuilder {
         addToLibrary(P, "Sliver Overlord", 1);
         addToLibrary(P, "Wingsteed Rider", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 3);
-        createPermanent(game,P, "Rupture Spire", false, 9);
-        createPermanent(game,P, "Tower of the Magistrate", false, 1);
-        createPermanent(game,P, "Dragon Blood", false, 1);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P, "Rupture Spire", false, 9);
+        createPermanent(P, "Tower of the Magistrate", false, 1);
+        createPermanent(P, "Dragon Blood", false, 1);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Rupture Spire", 1);
 
         P = opponent;
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Trained Jackal", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
diff --git a/src/magic/test/TestPyroclasm.java b/src/magic/test/TestPyroclasm.java
index 850488317c..fa90fc5d8c 100644
--- a/src/magic/test/TestPyroclasm.java
+++ b/src/magic/test/TestPyroclasm.java
@@ -23,7 +23,7 @@ class TestPyroclasm extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,1);
+        createPermanent(P,"Rupture Spire",false,1);
         addToHand(P,"Pyroclasm",2);
 
 
@@ -32,7 +32,7 @@ class TestPyroclasm extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Llanowar Elves", 1);
         addToHand(P,"Mogg Fanatic", 1);
         addToHand(P,"Prickly Boggart", 1);
diff --git a/src/magic/test/TestRatchetBomb.java b/src/magic/test/TestRatchetBomb.java
index 6533a56dd6..9f9e692c82 100644
--- a/src/magic/test/TestRatchetBomb.java
+++ b/src/magic/test/TestRatchetBomb.java
@@ -17,7 +17,7 @@ class TestRatchetBomb extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Kor Firewalker",1);
         addToHand(P,"Ratchet Bomb",1);
 
@@ -26,8 +26,8 @@ class TestRatchetBomb extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,1);
         addToHand(P,"Ratchet Bomb",1);
         addToHand(P,"Lightning Bolt",1);
 
diff --git a/src/magic/test/TestReaperKing.java b/src/magic/test/TestReaperKing.java
index 17f72a363b..99a39e454c 100644
--- a/src/magic/test/TestReaperKing.java
+++ b/src/magic/test/TestReaperKing.java
@@ -17,23 +17,23 @@ class TestReaperKing extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plateau",false,2);
-        createPermanent(game,P,"Tundra",false,2);
-        createPermanent(game,P,"Savannah",false,2);
-        createPermanent(game,P,"Scrubland",false,2);
-        createPermanent(game,P,"Bayou",false,2);
-        createPermanent(game,P,"Taiga",false,2);
-        createPermanent(game,P,"Tropical Island",false,2);
-        createPermanent(game,P,"Underground Sea",false,2);
-        createPermanent(game,P,"Volcanic Island",false,2);
-        createPermanent(game,P,"Badlands",false,2);
+        createPermanent(P,"Plateau",false,2);
+        createPermanent(P,"Tundra",false,2);
+        createPermanent(P,"Savannah",false,2);
+        createPermanent(P,"Scrubland",false,2);
+        createPermanent(P,"Bayou",false,2);
+        createPermanent(P,"Taiga",false,2);
+        createPermanent(P,"Tropical Island",false,2);
+        createPermanent(P,"Underground Sea",false,2);
+        createPermanent(P,"Volcanic Island",false,2);
+        createPermanent(P,"Badlands",false,2);
         addToHand(P,"Reaper King",4);
         
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestRecoverMR.java b/src/magic/test/TestRecoverMR.java
index 5aa263ea39..5a190ad56d 100644
--- a/src/magic/test/TestRecoverMR.java
+++ b/src/magic/test/TestRecoverMR.java
@@ -23,7 +23,7 @@ class TestRecoverMR extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Recover",1);
         addToGraveyard(P,"Murderous Redcap",1);
         addToGraveyard(P,"Ruthless Cullblade",1);
@@ -34,7 +34,7 @@ class TestRecoverMR extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Stonework Puma",1);
         addToHand(P,"Llanowar Elves", 1);
         addToHand(P,"Prickly Boggart", 1);
diff --git a/src/magic/test/TestRecurringNightmare.java b/src/magic/test/TestRecurringNightmare.java
index e46ff0c6a3..41f5f9e299 100644
--- a/src/magic/test/TestRecurringNightmare.java
+++ b/src/magic/test/TestRecurringNightmare.java
@@ -18,15 +18,15 @@ class TestRecurringNightmare extends TestGameBuilder {
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
         addToGraveyard(P, "Pale Bears", 1);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Recurring Nightmare",false,1);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Recurring Nightmare",false,1);
+        createPermanent(P,"Grizzly Bears",false,1);
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestRegen.java b/src/magic/test/TestRegen.java
index e88c1ccf34..13eac9aa4c 100644
--- a/src/magic/test/TestRegen.java
+++ b/src/magic/test/TestRegen.java
@@ -17,7 +17,7 @@ class TestRegen extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Doom Blade",3);
 
 
@@ -25,8 +25,8 @@ class TestRegen extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"River Boa",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"River Boa",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestReplicate.java b/src/magic/test/TestReplicate.java
index 96fd82daa0..b0e4cb63e5 100644
--- a/src/magic/test/TestReplicate.java
+++ b/src/magic/test/TestReplicate.java
@@ -17,8 +17,8 @@ class TestReplicate extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P,"Leap of Flame",1);
         addToHand(P,"Train of Thought",1);
         addToHand(P,"Pyromatics",1);
@@ -29,8 +29,8 @@ class TestReplicate extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P,"Leap of Flame",1);
         addToHand(P,"Train of Thought",1);
         addToHand(P,"Pyromatics",1);
diff --git a/src/magic/test/TestRequires.java b/src/magic/test/TestRequires.java
index 2a43f6b2bd..77d57d50df 100644
--- a/src/magic/test/TestRequires.java
+++ b/src/magic/test/TestRequires.java
@@ -17,7 +17,7 @@ class TestRequires extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Griptide",1);
         addToHand(P,"Holy Day",1);
         addToHand(P,"Twincast",1);
@@ -27,7 +27,7 @@ class TestRequires extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Thieving Magpie",3);
 
         return game;
diff --git a/src/magic/test/TestRestorationToken.java b/src/magic/test/TestRestorationToken.java
index 6b728ad393..ce76448983 100644
--- a/src/magic/test/TestRestorationToken.java
+++ b/src/magic/test/TestRestorationToken.java
@@ -17,7 +17,7 @@ class TestRestorationToken extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Join the Ranks",1);
         addToHand(P,"Restoration Angel",1);
 
@@ -25,7 +25,7 @@ class TestRestorationToken extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestRise.java b/src/magic/test/TestRise.java
index 6c0a9e49e9..76f4701efe 100644
--- a/src/magic/test/TestRise.java
+++ b/src/magic/test/TestRise.java
@@ -17,14 +17,14 @@ class TestRise extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,1);
+        createPermanent(P,"Plains",false,1);
         addToHand(P,"Rise of the Hobgoblins",1);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,1);
+        createPermanent(P,"Plains",false,1);
         addToHand(P,"Rise of the Hobgoblins",1);
 
         return game;
diff --git a/src/magic/test/TestRishadan.java b/src/magic/test/TestRishadan.java
index 9fceb68ff3..41e3322947 100644
--- a/src/magic/test/TestRishadan.java
+++ b/src/magic/test/TestRishadan.java
@@ -20,11 +20,11 @@ class TestRishadan extends TestGameBuilder {
 
         P.setLife(15);
         addToLibrary(P, "Forest", 22);
-        createPermanent(game,P,"Forest",false,4);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Skyshroud Sentinel",false,1);
-        createPermanent(game,P,"Vampire Hounds",true,1);
-        createPermanent(game,P,"Soldevi Digger",false,1);
+        createPermanent(P,"Forest",false,4);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Skyshroud Sentinel",false,1);
+        createPermanent(P,"Vampire Hounds",true,1);
+        createPermanent(P,"Soldevi Digger",false,1);
         addToHand(P,"Howling Wolf",3);
         addToHand(P,"Skyshroud Sentinel",2);
         
@@ -42,13 +42,13 @@ class TestRishadan extends TestGameBuilder {
         P.setLife(8);
         addToLibrary(P, "Forest", 19);
         addToHand(P, "Vampire Hounds",1);
-        createPermanent(game,P,"Forest",false,1);
-        createPermanent(game,P,"Bayou",false,2);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Vampire Hounds",false,2);
-        createPermanent(game,P,"Skyshroud Sentinel",false,2);
-        createPermanent(game,P,"Howling Wolf",false,1);
-        createPermanent(game,P,"Rishadan Pawnshop",false,1);
+        createPermanent(P,"Forest",false,1);
+        createPermanent(P,"Bayou",false,2);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Vampire Hounds",false,2);
+        createPermanent(P,"Skyshroud Sentinel",false,2);
+        createPermanent(P,"Howling Wolf",false,1);
+        createPermanent(P,"Rishadan Pawnshop",false,1);
         addToHand(P,"Exhume",1);
         addToGraveyard(P, "Exhume", 2);
 
diff --git a/src/magic/test/TestRoilElemental.java b/src/magic/test/TestRoilElemental.java
index 6aa51ea670..585c4e8660 100644
--- a/src/magic/test/TestRoilElemental.java
+++ b/src/magic/test/TestRoilElemental.java
@@ -17,7 +17,7 @@ class TestRoilElemental extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Roil Elemental",1);
 
 
@@ -25,8 +25,8 @@ class TestRoilElemental extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Serra Angel",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Serra Angel",false,1);
         addToHand(P,"Act of Treason",1);
 
         return game;
diff --git a/src/magic/test/TestRustingGolem.java b/src/magic/test/TestRustingGolem.java
index 8e559d9433..ab7c053668 100644
--- a/src/magic/test/TestRustingGolem.java
+++ b/src/magic/test/TestRustingGolem.java
@@ -17,7 +17,7 @@ class TestRustingGolem extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Rusting Golem",1);
         addToHand(P,"Godhead of Awe",1);
         addToHand(P, "Mortivore", 1);
@@ -27,7 +27,7 @@ class TestRustingGolem extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestSPSS.java b/src/magic/test/TestSPSS.java
index 1e142926d5..5d9193a71a 100644
--- a/src/magic/test/TestSPSS.java
+++ b/src/magic/test/TestSPSS.java
@@ -23,7 +23,7 @@ class TestSPSS extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Sphere of the Suns",1);
         addToHand(P,"Vivid Crag",1);
         addToHand(P,"Spell Pierce",1);
@@ -35,7 +35,7 @@ class TestSPSS extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Stonework Puma",1);
         addToHand(P,"Llanowar Elves", 1);
         addToHand(P,"Prickly Boggart", 1);
diff --git a/src/magic/test/TestSanguineBond.java b/src/magic/test/TestSanguineBond.java
index 729fb9de45..b4da9f34bd 100644
--- a/src/magic/test/TestSanguineBond.java
+++ b/src/magic/test/TestSanguineBond.java
@@ -17,18 +17,18 @@ class TestSanguineBond extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sanguine Bond",false,1);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sanguine Bond",false,1);
+        createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P, "Exquisite Blood", 1);
 
         P = opponent;
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sanguine Bond",false,1);
-        createPermanent(game,P,"Grizzly Bears",false,2);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sanguine Bond",false,1);
+        createPermanent(P,"Grizzly Bears",false,2);
         addToHand(P, "Exquisite Blood", 1);
 
         return game;
diff --git a/src/magic/test/TestScry.java b/src/magic/test/TestScry.java
index ad4918512e..4e19aae17e 100644
--- a/src/magic/test/TestScry.java
+++ b/src/magic/test/TestScry.java
@@ -20,10 +20,10 @@ class TestScry extends TestGameBuilder {
         addToLibrary(P, "Island", 2);
         addToLibrary(P, "Entreat the Angels", 1);
         addToLibrary(P, "Sliver Overlord", 1);
-        createPermanent(game,P, "Island", false, 10);
-        createPermanent(game,P,"Chromatic Lantern");
-        createPermanent(game,P,"Flamespeaker Adept");
-        createPermanent(game,P,"Knowledge and Power");
+        createPermanent(P, "Island", false, 10);
+        createPermanent(P,"Chromatic Lantern");
+        createPermanent(P,"Flamespeaker Adept");
+        createPermanent(P,"Knowledge and Power");
         addToHand(P, "Spark Jolt", 2);
         addToHand(P, "Temple of Silence", 1);
         addToHand(P,"Opt",1);
@@ -32,9 +32,9 @@ class TestScry extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Temple of Silence", 20);
-        createPermanent(game,P,"Rupture Spire",false,1);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
-        createPermanent(game,P,"Flamespeaker Adept");
+        createPermanent(P,"Rupture Spire",false,1);
+        createPermanent(P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Flamespeaker Adept");
         addToHand(P, "Spark Jolt", 1);
         addToHand(P, "Temple of Silence", 1);
 
diff --git a/src/magic/test/TestSearch.java b/src/magic/test/TestSearch.java
index d333bf2c6f..8a62fb47db 100644
--- a/src/magic/test/TestSearch.java
+++ b/src/magic/test/TestSearch.java
@@ -22,8 +22,8 @@ class TestSearch extends TestGameBuilder {
         addToLibrary(P, "Goblin King", 4);
         addToLibrary(P, "Forest", 20);
         addToLibrary(P, "Island", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 2);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 2);
         addToHand(P, "Misty Rainforest", 1);
         addToHand(P, "Terramorphic Expanse", 1);
         addToHand(P, "Rampant Growth", 1);
@@ -39,8 +39,8 @@ class TestSearch extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
         return game;
diff --git a/src/magic/test/TestSelfSac.java b/src/magic/test/TestSelfSac.java
index 5db6263b55..dfc2476209 100644
--- a/src/magic/test/TestSelfSac.java
+++ b/src/magic/test/TestSelfSac.java
@@ -17,14 +17,14 @@ class TestSelfSac extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P,"Swamp",10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Fallen Angel",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Fallen Angel",false,1);
 
         P = player;
 
         P.setLife(5);
         addToLibrary(P,"Mountain",10);
-        createPermanent(game,P,"Mountain",false,4);
+        createPermanent(P,"Mountain",false,4);
         addToHand(P,"Act of Treason",1);
 
         return game;
diff --git a/src/magic/test/TestSetSource.java b/src/magic/test/TestSetSource.java
index 7b27525ca7..638430a346 100644
--- a/src/magic/test/TestSetSource.java
+++ b/src/magic/test/TestSetSource.java
@@ -17,7 +17,7 @@ class TestSetSource extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Joraga Warcaller",2);
         addToHand(P,"Llanowar Elite",2);
 
@@ -26,8 +26,8 @@ class TestSetSource extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestSignalPest.java b/src/magic/test/TestSignalPest.java
index cd4a931b03..a2e1d9b9fe 100644
--- a/src/magic/test/TestSignalPest.java
+++ b/src/magic/test/TestSignalPest.java
@@ -23,7 +23,7 @@ class TestSignalPest extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Sphere of the Suns",2);
         addToHand(P,"Mox Opal",2);
         addToHand(P,"Signal Pest",3);
@@ -34,7 +34,7 @@ class TestSignalPest extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Giant Spider",1);
         addToHand(P,"Birds of Paradise", 1);
         addToHand(P,"Sphere of the Suns",1);
diff --git a/src/magic/test/TestSilverbladePaladin.java b/src/magic/test/TestSilverbladePaladin.java
index ccb8a7b3a1..e8e5447fb0 100644
--- a/src/magic/test/TestSilverbladePaladin.java
+++ b/src/magic/test/TestSilverbladePaladin.java
@@ -17,7 +17,7 @@ class TestSilverbladePaladin extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Kor Firewalker",3);
         addToHand(P,"Silverblade Paladin",3);
 
@@ -26,8 +26,8 @@ class TestSilverbladePaladin extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
         addToHand(P,"Silverblade Paladin",3);
 
         return game;
diff --git a/src/magic/test/TestSliver.java b/src/magic/test/TestSliver.java
index 906c19a834..ef9744d41a 100644
--- a/src/magic/test/TestSliver.java
+++ b/src/magic/test/TestSliver.java
@@ -17,18 +17,18 @@ class TestSliver extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Island", 10);
-        createPermanent(game,P,"Island",false,20);
-        createPermanent(game,P,"Sliver Queen",false,1);
-        createPermanent(game,P,"Heart Sliver",false,1);
-        createPermanent(game,P,"Magma Sliver",false,1);
+        createPermanent(P,"Island",false,20);
+        createPermanent(P,"Sliver Queen",false,1);
+        createPermanent(P,"Heart Sliver",false,1);
+        createPermanent(P,"Magma Sliver",false,1);
 
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Plains",false,10);
-        createPermanent(game,P,"Honor Guard",false,4);
+        createPermanent(P,"Plains",false,10);
+        createPermanent(P,"Honor Guard",false,4);
 
         return game;
     }
diff --git a/src/magic/test/TestSolemnOffering.java b/src/magic/test/TestSolemnOffering.java
index a4f9c76306..37865ca516 100644
--- a/src/magic/test/TestSolemnOffering.java
+++ b/src/magic/test/TestSolemnOffering.java
@@ -17,15 +17,15 @@ class TestSolemnOffering extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Solemn Offering",1);
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Darksteel Juggernaut",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Darksteel Juggernaut",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestSosuke.java b/src/magic/test/TestSosuke.java
index f05bba58c9..04038cb437 100644
--- a/src/magic/test/TestSosuke.java
+++ b/src/magic/test/TestSosuke.java
@@ -19,16 +19,16 @@ class TestSosuke extends TestGameBuilder {
         P.setLife(6);
         addToLibrary(P, "Forest", 20);
         addToLibrary(P, "Island", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Sosuke, Son of Seshiro", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Sosuke, Son of Seshiro", false, 1);
         addToHand(P, "Lightning Bolt", 1);
 
         P = opponent;
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
         return game;
diff --git a/src/magic/test/TestSoulbond.java b/src/magic/test/TestSoulbond.java
index 6de3d69fcc..a31f35d7ae 100644
--- a/src/magic/test/TestSoulbond.java
+++ b/src/magic/test/TestSoulbond.java
@@ -28,10 +28,10 @@ class TestSoulbond extends TestGameBuilder {
 
         P.setLife(12);
         addToLibrary(P,"Plains",15);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Creeping Tar Pit",false,1);
-        createPermanent(game,P,"Wingcrafter",false,1);
-        createPermanent(game,P,"Wall of Stone",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Creeping Tar Pit",false,1);
+        createPermanent(P,"Wingcrafter",false,1);
+        createPermanent(P,"Wall of Stone",false,1);
         addToHand(P,"Wingcrafter",1);
         addToHand(P,"Barony Vampire",1);
         addToHand(P,"Act of Treason",1);
@@ -43,10 +43,10 @@ class TestSoulbond extends TestGameBuilder {
 
         P.setLife(12);
         addToLibrary(P, "Swamp", 15);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Assault Griffin",false,1);
-        createPermanent(game,P,"Hagra Diabolist",false,1);
-        final MagicPermanent la = createPermanent(game, P, "Legacy's Allure", false, 1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Assault Griffin",false,1);
+        createPermanent(P,"Hagra Diabolist",false,1);
+        final MagicPermanent la = createPermanent(P, "Legacy's Allure", false, 1);
         game.doAction(new ChangeCountersAction(la, MagicCounterType.Charge, 3));
         addToHand(P,"Wingcrafter",1);
         addToHand(P,"Eager Cadet",1);
diff --git a/src/magic/test/TestSparkmageApprentice.java b/src/magic/test/TestSparkmageApprentice.java
index 22435847b4..a8cbcf57c7 100644
--- a/src/magic/test/TestSparkmageApprentice.java
+++ b/src/magic/test/TestSparkmageApprentice.java
@@ -17,14 +17,14 @@ class TestSparkmageApprentice extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Sparkmage Apprentice",1);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestSpiritOfTheHearth.java b/src/magic/test/TestSpiritOfTheHearth.java
index b75733e9a1..fa537d3457 100644
--- a/src/magic/test/TestSpiritOfTheHearth.java
+++ b/src/magic/test/TestSpiritOfTheHearth.java
@@ -17,14 +17,14 @@ class TestSpiritOfTheHearth extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Spirit of the Hearth", 1);
 
         P = opponent;
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Concussive Bolt", 1);
 
         return game;
diff --git a/src/magic/test/TestStatics.java b/src/magic/test/TestStatics.java
index 9cf892293b..8cb1a22253 100644
--- a/src/magic/test/TestStatics.java
+++ b/src/magic/test/TestStatics.java
@@ -18,10 +18,10 @@ class TestStatics extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Creeping Tar Pit",false,1);
-        createPermanent(game,P,"Raging Ravine",false,1);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Creeping Tar Pit",false,1);
+        createPermanent(P,"Raging Ravine",false,1);
+        createPermanent(P,"Phyrexian Crusader",false,3);
         addToHand(P,"Glorious Anthem",1);
         addToHand(P,"Godhead of Awe",1);
         addToHand(P,"Aven Mimeomancer",1);
@@ -37,8 +37,8 @@ class TestStatics extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestStorm.java b/src/magic/test/TestStorm.java
index 5977db9691..4e42b84aba 100644
--- a/src/magic/test/TestStorm.java
+++ b/src/magic/test/TestStorm.java
@@ -17,8 +17,8 @@ class TestStorm extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Island",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,2);
+        createPermanent(P,"Island",false,8);
+        createPermanent(P,"Grizzly Bears",false,2);
         addToHand(P, "Astral Steel", 3);
         addToHand(P, "Brain Freeze", 3);
         addToHand(P, "Flusterstorm", 3);
@@ -27,7 +27,7 @@ class TestStorm extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Island",false,8);
+        createPermanent(P,"Island",false,8);
         //addToHand(P, "Flusterstorm", 3);
 
         return game;
diff --git a/src/magic/test/TestSunTitan.java b/src/magic/test/TestSunTitan.java
index cf305d9cfb..ba425c10bc 100644
--- a/src/magic/test/TestSunTitan.java
+++ b/src/magic/test/TestSunTitan.java
@@ -17,7 +17,7 @@ class TestSunTitan extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Kor Firewalker",3);
         addToHand(P,"Sun Titan",3);
 
@@ -26,8 +26,8 @@ class TestSunTitan extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
         addToHand(P,"Lightning Bolt",3);
 
         return game;
diff --git a/src/magic/test/TestSuturePriest.java b/src/magic/test/TestSuturePriest.java
index 3b71ac0f8d..3f00a790b6 100644
--- a/src/magic/test/TestSuturePriest.java
+++ b/src/magic/test/TestSuturePriest.java
@@ -17,8 +17,8 @@ class TestSuturePriest extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Suture Priest",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Suture Priest",false,1);
         addToHand(P,"Kor Firewalker",3);
         addToHand(P,"Sun Titan",3);
 
@@ -27,8 +27,8 @@ class TestSuturePriest extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Suture Priest",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Suture Priest",false,1);
         addToHand(P,"Kor Firewalker",3);
         addToHand(P,"Sun Titan",3);
 
diff --git a/src/magic/test/TestTectonicEdge.java b/src/magic/test/TestTectonicEdge.java
index 0c44e58bf0..1bf8625071 100644
--- a/src/magic/test/TestTectonicEdge.java
+++ b/src/magic/test/TestTectonicEdge.java
@@ -23,7 +23,7 @@ class TestTectonicEdge extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,1);
+        createPermanent(P,"Rupture Spire",false,1);
         addToHand(P,"Tectonic Edge",1);
         addToHand(P,"Vivid Crag",1);
         addToHand(P,"Stonework Puma",1);
@@ -35,8 +35,8 @@ class TestTectonicEdge extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,3);
-        createPermanent(game,P,"Tectonic Edge",false,3);
+        createPermanent(P,"Rupture Spire",false,3);
+        createPermanent(P,"Tectonic Edge",false,3);
         addToHand(P,"Vines of Vastwood",1);
         addToHand(P,"Inkwell Leviathan",1);
 
diff --git a/src/magic/test/TestTemporalMastery.java b/src/magic/test/TestTemporalMastery.java
index 8d9492c27e..b746bfb358 100644
--- a/src/magic/test/TestTemporalMastery.java
+++ b/src/magic/test/TestTemporalMastery.java
@@ -17,7 +17,7 @@ class TestTemporalMastery extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Temporal Mastery", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Repulse",3);
 
 
@@ -25,8 +25,8 @@ class TestTemporalMastery extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Phyrexian Crusader",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Phyrexian Crusader",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestTerror.java b/src/magic/test/TestTerror.java
index d2b82d38c7..70f1c7eab2 100644
--- a/src/magic/test/TestTerror.java
+++ b/src/magic/test/TestTerror.java
@@ -17,16 +17,16 @@ class TestTerror extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
         addToHand(P,"Terror",1);
 
         P = opponent;
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Thieving Magpie",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Thieving Magpie",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestThallid.java b/src/magic/test/TestThallid.java
index bf4724f2e0..f23fbbe2bd 100644
--- a/src/magic/test/TestThallid.java
+++ b/src/magic/test/TestThallid.java
@@ -17,7 +17,7 @@ class TestThallid extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Deathspore Thallid", 1);
         addToHand(P, "Thallid Devourer", 1);
         addToHand(P, "Vitaspore Thallid", 1);
@@ -26,7 +26,7 @@ class TestThallid extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Thallid", 1);
         addToHand(P, "Thallid Shell-Dweller", 1);
         addToHand(P, "Thallid Germinator", 1);
diff --git a/src/magic/test/TestTotemArmorIndestructible.java b/src/magic/test/TestTotemArmorIndestructible.java
index 773919b638..b23ad73b59 100644
--- a/src/magic/test/TestTotemArmorIndestructible.java
+++ b/src/magic/test/TestTotemArmorIndestructible.java
@@ -17,9 +17,9 @@ class TestTotemArmorIndestructible extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,1);
-        createPermanent(game,P,"Darksteel Plate",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,1);
+        createPermanent(P,"Darksteel Plate",false,1);
         addToHand(P,"Spider Umbra",1);
         addToHand(P,"Doom Blade",1);
 
@@ -28,7 +28,7 @@ class TestTotemArmorIndestructible extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestTrainOfThought.java b/src/magic/test/TestTrainOfThought.java
index 868473d8bb..771950167d 100644
--- a/src/magic/test/TestTrainOfThought.java
+++ b/src/magic/test/TestTrainOfThought.java
@@ -17,8 +17,8 @@ class TestTrainOfThought extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,1);
         addToHand(P,"Train of Thought",1);
 
 
@@ -26,8 +26,8 @@ class TestTrainOfThought extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Sun Titan",false,3);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Sun Titan",false,3);
 
         return game;
     }
diff --git a/src/magic/test/TestTribute.java b/src/magic/test/TestTribute.java
index bd4bba6912..b378b46ca4 100644
--- a/src/magic/test/TestTribute.java
+++ b/src/magic/test/TestTribute.java
@@ -22,8 +22,8 @@ class TestTribute extends TestGameBuilder {
         addToLibrary(P, "Sliver Overlord", 1);
         addToLibrary(P, "Wingsteed Rider", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 3);
-        createPermanent(game,P, "Rupture Spire", false, 9);
-        createPermanent(game,P, "Hollowsage", false, 1);
+        createPermanent(P, "Rupture Spire", false, 9);
+        createPermanent(P, "Hollowsage", false, 1);
         addToHand(P, "Rupture Spire", 1);
         addToHand(P, "Fanatic of Xenagos", 1);
         addToHand(P, "Siren of the Fanged Coast", 1);
@@ -33,8 +33,8 @@ class TestTribute extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P, "Grizzly Bears", false, 1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Trained Jackal", 1);
         addToGraveyard(P, "Ink-Eyes, Servant of Oni", 1);
 
diff --git a/src/magic/test/TestTumbleMagnet.java b/src/magic/test/TestTumbleMagnet.java
index 167d7d0490..444069d0cf 100644
--- a/src/magic/test/TestTumbleMagnet.java
+++ b/src/magic/test/TestTumbleMagnet.java
@@ -23,7 +23,7 @@ class TestTumbleMagnet extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Tumble Magnet",1);
 
 
@@ -32,7 +32,7 @@ class TestTumbleMagnet extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P,"Stonework Puma",1);
         addToHand(P,"Tumble Magnet",1);
         addToHand(P,"Llanowar Elves", 1);
diff --git a/src/magic/test/TestTwincastEndlessLoop.java b/src/magic/test/TestTwincastEndlessLoop.java
index d5dfe49a7b..30037615d4 100644
--- a/src/magic/test/TestTwincastEndlessLoop.java
+++ b/src/magic/test/TestTwincastEndlessLoop.java
@@ -23,9 +23,9 @@ class TestTwincastEndlessLoop extends TestGameBuilder {
 
         P.setLife(6);
         addToLibrary(P, "Plains", 15);
-        createPermanent(game,P,"Rupture Spire",false,6);
-        createPermanent(game,P,"Wall of Diffusion",false,1);
-        createPermanent(game,P,"Eager Cadet",false,1);
+        createPermanent(P,"Rupture Spire",false,6);
+        createPermanent(P,"Wall of Diffusion",false,1);
+        createPermanent(P,"Eager Cadet",false,1);
         addToHand(P,"Twincast",1);
         addToHand(P,"Benalish Lancer",1);
         addToHand(P,"Accorder Paladin",1);
@@ -38,9 +38,9 @@ class TestTwincastEndlessLoop extends TestGameBuilder {
 
         P.setLife(12);
         addToLibrary(P, "Swamp", 15);
-        createPermanent(game,P,"Rupture Spire",false,4);
-        createPermanent(game,P,"Eager Cadet",false,1);
-        createPermanent(game,P,"Diregraf Ghoul",false,1);
+        createPermanent(P,"Rupture Spire",false,4);
+        createPermanent(P,"Eager Cadet",false,1);
+        createPermanent(P,"Diregraf Ghoul",false,1);
         addToHand(P,"Twincast",1);
 
         return game;
diff --git a/src/magic/test/TestTwincastStitchTogether.java b/src/magic/test/TestTwincastStitchTogether.java
index e7087ea9b4..cddee9203a 100644
--- a/src/magic/test/TestTwincastStitchTogether.java
+++ b/src/magic/test/TestTwincastStitchTogether.java
@@ -17,7 +17,7 @@ class TestTwinCastStitchTogether extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Twincast", 1);
         addToHand(P, "Aven Squire", 1);
         addToGraveyard(P, "Aven Squire", 1);
@@ -26,7 +26,7 @@ class TestTwinCastStitchTogether extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Stitch Together", 1);
         addToHand(P, "Electrickery", 1);
         addToGraveyard(P, "Aven Squire", 1);
diff --git a/src/magic/test/TestTyreal.java b/src/magic/test/TestTyreal.java
index 7969e00a5e..d3fa0554f1 100644
--- a/src/magic/test/TestTyreal.java
+++ b/src/magic/test/TestTyreal.java
@@ -20,15 +20,15 @@ class TestTyreal extends TestGameBuilder {
 
     P.setLife(20);
     addToLibrary(P, "Plains", 10);
-    createPermanent(game, P, "Rupture Spire", false, 10);
-    //createPermanent(game, P, "Goblin Bombardment", false, 1);
-    //createPermanent(game, P, "Jayemdae Tome", false, 1);
-    //createPermanent(game, P, "Mad Auntie", false, 1);
-    //createPermanent(game, P, "Ib Halfheart, Goblin Tactician", false, 1);
-    //createPermanent(game, P, "Boggart Shenanigans", false, 1);
-    //createPermanent(game, P, "Knucklebone Witch", false, 1);
-    //createPermanent(game, P, "Strangleroot Geist", false, 1);
-    //createPermanent(game, P, "Vorapede", false, 1);
+    createPermanent(P, "Rupture Spire", false, 10);
+    //createPermanent(P, "Goblin Bombardment", false, 1);
+    //createPermanent(P, "Jayemdae Tome", false, 1);
+    //createPermanent(P, "Mad Auntie", false, 1);
+    //createPermanent(P, "Ib Halfheart, Goblin Tactician", false, 1);
+    //createPermanent(P, "Boggart Shenanigans", false, 1);
+    //createPermanent(P, "Knucklebone Witch", false, 1);
+    //createPermanent(P, "Strangleroot Geist", false, 1);
+    //createPermanent(P, "Vorapede", false, 1);
     addToHand(P, "Dungeon Geists", 1);
     addToHand(P, "Torch Fiend", 1);
     addToHand(P, "Disenchant", 1);
@@ -37,13 +37,13 @@ class TestTyreal extends TestGameBuilder {
 
     P.setLife(1);
     addToLibrary(P, "Plains", 10);
-    createPermanent(game, P, "Rupture Spire", false, 10);
-    createPermanent(game, P, "Mad Auntie", false, 1);
-    final MagicPermanent la = createPermanent(game, P, "Legacy's Allure", false, 1);
+    createPermanent(P, "Rupture Spire", false, 10);
+    createPermanent(P, "Mad Auntie", false, 1);
+    final MagicPermanent la = createPermanent(P, "Legacy's Allure", false, 1);
     game.doAction(new ChangeCountersAction(la, MagicCounterType.Charge, 1));
     //game.doAction(new MagicChangeCountersAction(la, MagicCounterType.Charge, 1));
-    //createPermanent(game, P, "Mad Auntie", false, 1);
-    // createPermanent(game,P,"Jayemdae Tome",false,1);
+    //createPermanent(P, "Mad Auntie", false, 1);
+    // createPermanent(P,"Jayemdae Tome",false,1);
 
     return game;
     }
diff --git a/src/magic/test/TestUI_UserActionPanel.java b/src/magic/test/TestUI_UserActionPanel.java
index f0dd4cf37b..3afff24ea9 100644
--- a/src/magic/test/TestUI_UserActionPanel.java
+++ b/src/magic/test/TestUI_UserActionPanel.java
@@ -19,10 +19,10 @@ class TestUI_UserActionPanel extends TestGameBuilder {
         P.setLife(20);
         addToLibrary(P, "Forest", 10);
         addToLibrary(P, "Adder-Staff Boggart", 1);
-        createPermanent(game, P, "Thousand Winds", false, 3);
-        createPermanent(game, P, "Island", false, 2);
-        createPermanent(game, P, "Mountain", false, 3);
-        createPermanent(game, P, "Forest", false, 2);
+        createPermanent(P, "Thousand Winds", false, 3);
+        createPermanent(P, "Island", false, 2);
+        createPermanent(P, "Mountain", false, 3);
+        createPermanent(P, "Forest", false, 2);
         addToHand(P, "Backslide", 1);
         addToHand(P, "Adder-Staff Boggart", 1);
         addToHand(P, "Joraga Warcaller", 1);
diff --git a/src/magic/test/TestUlvenwaldBear.java b/src/magic/test/TestUlvenwaldBear.java
index e2a5723138..67ceedae7e 100644
--- a/src/magic/test/TestUlvenwaldBear.java
+++ b/src/magic/test/TestUlvenwaldBear.java
@@ -18,8 +18,8 @@ class TestUlvenwaldBear extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P,"Ulvenwald Bear",1);
         addToHand(P,"Lightning Bolt",1);
 
@@ -29,8 +29,8 @@ class TestUlvenwaldBear extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,8);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,8);
+        createPermanent(P,"Grizzly Bears",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestUnleash.java b/src/magic/test/TestUnleash.java
index de3cb39d86..50baa76676 100644
--- a/src/magic/test/TestUnleash.java
+++ b/src/magic/test/TestUnleash.java
@@ -17,7 +17,7 @@ class TestUnleash extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Bloodfray Giant", 1);
         addToHand(P, "Carnival Hellsteed", 1);
         addToHand(P, "Chaos Imps", 1);
@@ -34,7 +34,7 @@ class TestUnleash extends TestGameBuilder {
 
         P.setLife(10);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Bloodfray Giant", 1);
         addToHand(P, "Carnival Hellsteed", 1);
 
diff --git a/src/magic/test/TestVanishing.java b/src/magic/test/TestVanishing.java
index 49216b64ac..7340a9b692 100644
--- a/src/magic/test/TestVanishing.java
+++ b/src/magic/test/TestVanishing.java
@@ -17,8 +17,8 @@ class TestVanishing extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,4);
-        createPermanent(game,P,"Island",false,4);
+        createPermanent(P,"Rupture Spire",false,4);
+        createPermanent(P,"Island",false,4);
         addToHand(P, "Tidewalker", 1);
         addToHand(P, "Ravaging Riftwurm", 1);
         addToHand(P, "Calciderm", 1);
@@ -27,7 +27,7 @@ class TestVanishing extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }
diff --git a/src/magic/test/TestVarolz.java b/src/magic/test/TestVarolz.java
index d0ee41cd14..1f4c1e5a0a 100644
--- a/src/magic/test/TestVarolz.java
+++ b/src/magic/test/TestVarolz.java
@@ -19,17 +19,17 @@ class TestVarolz extends TestGameBuilder {
         P.setLife(10);
         addToLibrary(P, "Mountain", 20);
         addToGraveyard(P, "Vexing Devil", 1);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P,"Vigor",false,1);
-        createPermanent(game,P,"Goblin King",false,1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P,"Vigor",false,1);
+        createPermanent(P,"Goblin King",false,1);
         addToHand(P, "Varolz, the Scar-Striped", 1);
 
         P = opponent;
 
         P.setLife(10);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P,"Goblin King",false,2);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P,"Goblin King",false,2);
         addToHand(P, "Grizzly Bears", 2);
 
         return game;
diff --git a/src/magic/test/TestVinesOfVastwood.java b/src/magic/test/TestVinesOfVastwood.java
index 0a44ddb045..3a38200309 100644
--- a/src/magic/test/TestVinesOfVastwood.java
+++ b/src/magic/test/TestVinesOfVastwood.java
@@ -17,15 +17,15 @@ class TestVinesOfVastwood extends TestGameBuilder {
 
         P.setLife(5);
         addToLibrary(P, "Swamp", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
+        createPermanent(P,"Rupture Spire",false,9);
         addToHand(P, "Vines of Vastwood", 1);
 
         P = opponent;
 
         P.setLife(5);
         addToLibrary(P, "Mountain", 20);
-        createPermanent(game,P,"Rupture Spire",false,9);
-        createPermanent(game,P,"Grizzly Bears",false,1);
+        createPermanent(P,"Rupture Spire",false,9);
+        createPermanent(P,"Grizzly Bears",false,1);
         addToHand(P, "Vines of Vastwood", 1);
 
         return game;
diff --git a/src/magic/test/TestWasteland.java b/src/magic/test/TestWasteland.java
index de3250d8a0..67e721a37c 100644
--- a/src/magic/test/TestWasteland.java
+++ b/src/magic/test/TestWasteland.java
@@ -18,7 +18,7 @@ class TestWasteland extends TestGameBuilder {
         P.setLife(4);
         P.setPoison(6);
         addToLibrary(P,"Plains",10);
-        createPermanent(game,P,"Rupture Spire",false,1);
+        createPermanent(P,"Rupture Spire",false,1);
         addToHand(P,"Wasteland",1);
         addToHand(P,"Vivid Crag",1);
         addToHand(P,"Stonework Puma",1);
@@ -30,7 +30,7 @@ class TestWasteland extends TestGameBuilder {
         P.setLife(1);
         P.setPoison(8);
         addToLibrary(P,"Island",10);
-        createPermanent(game,P,"Rupture Spire",false,1);
+        createPermanent(P,"Rupture Spire",false,1);
         addToHand(P,"Wasteland",1);
         addToHand(P,"Vines of Vastwood",1);
         addToHand(P,"Inkwell Leviathan",1);
diff --git a/src/magic/test/TestWorship.java b/src/magic/test/TestWorship.java
index f995ed3345..0962575024 100644
--- a/src/magic/test/TestWorship.java
+++ b/src/magic/test/TestWorship.java
@@ -18,10 +18,10 @@ class TestWorship extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Plains",false,2);
-        createPermanent(game,P,"Worship",false,1);
-        createPermanent(game,P,"Air Servant",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Plains",false,2);
+        createPermanent(P,"Worship",false,1);
+        createPermanent(P,"Air Servant",false,1);
         addToHand(P,"Doom Blade",2);
         addToHand(P,"Demystify",2);
         addToHand(P,"Stomping Ground",1);
@@ -31,10 +31,10 @@ class TestWorship extends TestGameBuilder {
 
         P.setLife(2);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Swamp",false,4);
-        createPermanent(game,P,"Plains",false,2);
-        createPermanent(game,P,"Worship",false,1);
-        createPermanent(game,P,"Alpha Myr",false,1);
+        createPermanent(P,"Swamp",false,4);
+        createPermanent(P,"Plains",false,2);
+        createPermanent(P,"Worship",false,1);
+        createPermanent(P,"Alpha Myr",false,1);
 
         return game;
     }
diff --git a/src/magic/test/TestWurmKnight.java b/src/magic/test/TestWurmKnight.java
index 590d51247c..273842e15f 100644
--- a/src/magic/test/TestWurmKnight.java
+++ b/src/magic/test/TestWurmKnight.java
@@ -17,7 +17,7 @@ class TestWurmKnight extends TestGameBuilder {
 
         P.setLife(20);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
         addToHand(P, "Armada Wurm", 1);
         addToHand(P, "Knightly Valor", 1);
 
@@ -25,7 +25,7 @@ class TestWurmKnight extends TestGameBuilder {
 
         P.setLife(1);
         addToLibrary(P, "Plains", 10);
-        createPermanent(game,P,"Rupture Spire",false,8);
+        createPermanent(P,"Rupture Spire",false,8);
 
         return game;
     }