Removed all calls to assertAllCommandsUsed() and made it private since it will be automatically called

Mage.Tests/src/test/java/org/mage/test/AI/basic/AttackAndBlockByAITest.java

@@ -24,7 +24,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2 - 2);
@@ -39,7 +38,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2 - 2);
@@ -54,7 +52,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2);
@@ -69,7 +66,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2 - 2);
@@ -82,7 +78,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 1);
@@ -96,7 +91,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20); // no attacks
@@ -110,7 +104,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20); // no attacks
@@ -126,7 +119,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - ((15 - 1) * 2)); // one will be blocked
@@ -143,7 +135,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - ((10 - 1) * 2)); // one will be blocked
@@ -159,7 +150,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Goblin Brigand", 1);
         assertLife(playerA, 20);
@@ -177,7 +167,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Goblin Brigand", 2);
         assertLife(playerA, 20);
@@ -198,7 +187,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Arbor Elf", 1);
         assertLife(playerA, 20);
@@ -214,7 +202,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2);

Mage.Tests/src/test/java/org/mage/test/AI/basic/CastCreaturesTest.java

@@ -196,7 +196,6 @@ public class CastCreaturesTest extends CardTestPlayerBaseAI {
         setStrictChooseMode(true);
         setStopAt(3, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Ammit Eternal", 1);
 

Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java

@@ -26,7 +26,6 @@ public class ChooseTargetTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPermanentCount(playerB, "Silvercoat Lion", 1);
@@ -49,7 +48,6 @@ public class ChooseTargetTest extends CardTestPlayerBase {
         //setStrictChooseMode(true);
         setStopAt(2, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPermanentCount(playerB, "Silvercoat Lion", 1);

Mage.Tests/src/test/java/org/mage/test/AI/basic/CommanderCardScore.java

@@ -22,6 +22,5 @@ public class CommanderCardScore extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java

@@ -32,7 +32,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 1);
         assertPermanentCount(playerB, "Spectral Bears", 1);
@@ -55,7 +54,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 2);
         assertPermanentCount(playerB, "Spectral Bears", 0);
@@ -78,7 +76,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 1);
         assertPermanentCount(playerB, "Spectral Bears", 1);
@@ -102,7 +99,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 1);
         assertExileCount("Spectral Bears", 1);
@@ -126,7 +122,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 1);
         assertExileCount("Spectral Bears", 1);
@@ -150,7 +145,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 1);
         assertExileCount("Spectral Bears", 1);
@@ -175,7 +169,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         //setStrictChooseMode(true); // AI must choose
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 1);
         assertExileCount("Spectral Bears", 1);
@@ -200,7 +193,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         //setStrictChooseMode(true); // AI must choose
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Spectral Bears", 1);
         assertExileCount("Spectral Bears", 1);

Mage.Tests/src/test/java/org/mage/test/AI/basic/ExileTargetTest.java

@@ -31,7 +31,6 @@ public class ExileTargetTest extends CardTestCommander4Players {
         //setStrictChooseMode(true); // disable strict mode to activate AI for choosing
         setStopAt(1, PhaseStep.END_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerC, "Balduvian Bears", 0);
     }

Mage.Tests/src/test/java/org/mage/test/AI/basic/GainControlAITest.java

@@ -23,7 +23,6 @@ public class GainControlAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Island", 4);
         assertPermanentCount(playerA, "Swamp", 1);
@@ -43,7 +42,6 @@ public class GainControlAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Island", 4);
         assertPermanentCount(playerA, "Swamp", 1);
@@ -64,7 +62,6 @@ public class GainControlAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Island", 4);
         assertPermanentCount(playerA, "Swamp", 0);

Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetAmountAITest.java

@@ -25,7 +25,6 @@ public class TargetAmountAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         //setStrictChooseMode(true); // ai must choose
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Balduvian Bears", 2 + 4, 2 + 4); // boost one creature (it's just a choose code, so can be different from simulation results)
     }
@@ -45,7 +44,6 @@ public class TargetAmountAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Balduvian Bears", 2 + 1, 2 + 1); // boost each possible creatures
         assertPowerToughness(playerB, "Balduvian Bears", 2, 2); // no boost for enemy

Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java

@@ -28,7 +28,6 @@ public class TargetControllerChangeTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Evangelize", 1);
         assertPermanentCount(playerA, "Balduvian Bears", 1);
@@ -52,7 +51,6 @@ public class TargetControllerChangeTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); // AI must choose
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Evangelize", 1);
         assertPermanentCount(playerA, "Balduvian Bears", 1); // AI give smallest permanent to A as bad effect for target (target control change)

Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetPriorityTest.java

@@ -37,7 +37,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 3);
         assertPermanentCount(playerB, "Balduvian Bears", 3);
@@ -62,7 +61,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 3 - 1);
         //assertPermanentCount(playerB, "Balduvian Bears", 3);
@@ -87,7 +85,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 3);
         assertPermanentCount(playerB, "Balduvian Bears", 3);
@@ -118,7 +115,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
         //setStrictChooseMode(true); // AI
         setStopAt(3, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Burning Sun's Avatar", 1);
         assertPermanentCount(playerB, "Ancient Brontodon", 1); // can't be killed
@@ -145,7 +141,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 //        showHand("after", 1, PhaseStep.BEGIN_COMBAT, playerA);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         /* disabled checks cause target is not yet fixed, see comments at the start file
         assertPermanentCount(playerB, "Memnite", 1 * cardsMultiplier);
@@ -172,7 +167,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 3);
         assertPermanentCount(playerB, "Balduvian Bears", 3);
@@ -196,7 +190,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 3 - 1);
         assertPermanentCount(playerB, "Balduvian Bears", 3 - 1);
@@ -220,7 +213,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 3 - 1);
         assertPermanentCount(playerB, "Balduvian Bears", 3);
@@ -246,7 +238,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 3);
         assertPermanentCount(playerB, "Balduvian Bears", 3);
@@ -277,7 +268,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
         // showBattlefield("after", 1, PhaseStep.BEGIN_COMBAT, playerA);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "damage 3", 1);
 
@@ -308,7 +298,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Memnite", 1 * cardsMultiplier);
         assertPermanentCount(playerB, "Balduvian Bears", 1 * cardsMultiplier);

Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetRequiredTest.java

@@ -29,7 +29,6 @@ public class TargetRequiredTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Redcap Melee", 1);
         assertGraveyardCount(playerA, "Mountain", 1);
@@ -51,7 +50,6 @@ public class TargetRequiredTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); AI must select targets
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Redcap Melee", 1);
         assertGraveyardCount(playerA, "Mountain", 1);
@@ -73,7 +71,6 @@ public class TargetRequiredTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Redcap Melee", 1);
         assertGraveyardCount(playerB, "Silvercoat Lion", 1);
@@ -93,7 +90,6 @@ public class TargetRequiredTest extends CardTestPlayerBase {
         //setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Redcap Melee", 1);
         assertGraveyardCount(playerB, "Silvercoat Lion", 1);

Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetStackObjectByAITest.java

@@ -35,7 +35,6 @@ public class TargetStackObjectByAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Grizzly Bears", 0);
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
@@ -64,7 +63,6 @@ public class TargetStackObjectByAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         //setStrictChooseMode(true); // AI must choose
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Grizzly Bears", 0);
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
@@ -92,7 +90,6 @@ public class TargetStackObjectByAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true); // AI play with full simulation
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Grizzly Bears", 0);
         assertGraveyardCount(playerA, "Lightning Bolt", 1);

Mage.Tests/src/test/java/org/mage/test/AI/basic/TestFrameworkCanPlayAITest.java

@@ -27,7 +27,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
         assertPermanentCount(playerB, "Balduvian Bears", 5 - 1);
@@ -46,7 +45,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Lightning Bolt", 3);
         assertPermanentCount(playerB, "Balduvian Bears", 5 - 3);
@@ -62,7 +60,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 2);
     }
@@ -79,7 +76,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, 1);
         assertGraveyardCount(playerB, 1);
@@ -102,7 +98,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         Assert.assertEquals(1, currentGame.getBattlefield().getAllActivePermanents(CardType.CREATURE, currentGame).size());
         Permanent permanent = currentGame.getBattlefield().getAllActivePermanents(CardType.CREATURE, currentGame).get(0);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java

@@ -29,7 +29,6 @@ public class ChaosWandTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 + 3); // +3 from blood
         assertLife(playerB, 20 - 3); // -3 from blood

Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java

@@ -46,7 +46,6 @@ public class LightningStormTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Lightning Storm", 1);
         assertGraveyardCount(playerB, "Mountain", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ReconfigureTest.java

@@ -30,7 +30,6 @@ public class ReconfigureTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertType(boar, CardType.CREATURE, false);
         assertSubtype(boar, SubType.EQUIPMENT);
@@ -51,7 +50,6 @@ public class ReconfigureTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertType(boar, CardType.CREATURE, true);
         assertSubtype(boar, SubType.EQUIPMENT);
@@ -73,7 +71,6 @@ public class ReconfigureTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertType(boar, CardType.CREATURE, false);
         assertSubtype(boar, SubType.EQUIPMENT);
@@ -94,7 +91,6 @@ public class ReconfigureTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertType(boar, CardType.CREATURE, false);
         assertSubtype(boar, SubType.EQUIPMENT);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java

@@ -41,7 +41,6 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase {
 
         setStopAt(3, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2 - 2);
@@ -70,7 +69,6 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase {
 
         setStopAt(3, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java

@@ -388,7 +388,6 @@ public class CursesTest extends CardTestPlayerBase {
 
         try {
             execute();
-            assertAllCommandsUsed();
         } catch (Throwable e) {
             if (!e.getMessage().contains("Missing CHOICE def for turn 2, step UPKEEP, PlayerB")) {
                 Assert.fail("Should have had error about needing a target, but got:\n" + e.getMessage());

Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AetherFigmentTest.java

@@ -29,7 +29,6 @@ public class AetherFigmentTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BronzehideLionTest.java

@@ -26,7 +26,6 @@ public class BronzehideLionTest extends CardTestPlayerBase {
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terror", lion);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
         assertGraveyardCount(playerA, lion, 0);
         assertIsAttachedTo(playerA, lion, "Grizzly Bears");
     }
@@ -42,7 +41,6 @@ public class BronzehideLionTest extends CardTestPlayerBase {
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terror", lion);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
         assertGraveyardCount(playerA, lion, 1);
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java

@@ -35,8 +35,6 @@ public class GatherSpecimensTest extends CardTestPlayerBase {
 
         execute();
 
-        assertAllCommandsUsed();
-        
         assertGraveyardCount(playerA, "Gather Specimens", 1);
         
         assertPermanentCount(playerA, "Memnite", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/GisaGloriousResurrectorBlinkedTest.java

@@ -29,7 +29,6 @@ public class GisaGloriousResurrectorBlinkedTest extends CardTestPlayerBase {
 
         setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         // should be under playerA control
         assertPermanentCount(playerA, "Memnite", 1);
@@ -53,7 +52,6 @@ public class GisaGloriousResurrectorBlinkedTest extends CardTestPlayerBase {
 
         setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         // exiled Memnite stays in exile zone
         assertPermanentCount(playerA, "Memnite", 0);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java

@@ -24,7 +24,6 @@ public class AffinityForArtifactsTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Myr Enforcer", 4);
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AfflictTest.java

@@ -22,7 +22,6 @@ public class AfflictTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 19);
     }
@@ -41,7 +40,6 @@ public class AfflictTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 19);
 
@@ -57,7 +55,6 @@ public class AfflictTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 18);
     }
@@ -87,7 +84,6 @@ public class AfflictTest extends CardTestPlayerBase {
         activateAbility(1, PhaseStep.DECLARE_BLOCKERS, playerA, "{2},", "Frontline Devastator");
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerA, "Frontline Devastator", 1);
         assertPermanentCount(playerB, "Ruin Rat", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java

@@ -31,7 +31,6 @@ public class AmplifyTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Kilnmouth Dragon", 1);
         assertPowerToughness(playerA, "Kilnmouth Dragon", 8,8); // 5 + 3 from Amplify
@@ -55,7 +54,6 @@ public class AmplifyTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Kilnmouth Dragon", 1);
         assertPowerToughness(playerA, "Kilnmouth Dragon", 11,11); // 5 + 6 from Amplify
@@ -88,7 +86,6 @@ public class AmplifyTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Kilnmouth Dragon", 1);
         assertPowerToughness(playerA, "Kilnmouth Dragon", 8,8); // 5 + 3 from Amplify
@@ -123,7 +120,6 @@ public class AmplifyTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Kilnmouth Dragon", 1);
         assertPowerToughness(playerA, "Kilnmouth Dragon", 5,5); // 5 + 0 from Amplify

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java

@@ -70,7 +70,6 @@ public class AnnihilatorTest extends CardTestPlayerBase {
         setChoice(playerA, "Academy Rector"); // Annihilator
         setChoice(playerA, "Plains"); // Annihilator
         castSpell(2, PhaseStep.DECLARE_ATTACKERS, playerA, "Cauldron Haze", "Academy Rector", "Annihilator");
-        setChoice(playerA, false); // Academy Rector No Exile
 
         setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
         execute();

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AssistTest.java

@@ -22,7 +22,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -37,7 +36,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -53,7 +51,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -69,7 +66,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -85,7 +81,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -110,7 +105,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Charging Binox", 1);
     }
@@ -130,7 +124,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, "Charging Binox", 1);
         assertTappedCount("Forest", false, 8); // no mana used

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AwakenTest.java

@@ -146,7 +146,6 @@ public class AwakenTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -173,6 +172,5 @@ public class AwakenTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java

@@ -53,7 +53,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // because of protection the Hopeful Eidolon should be a creature on the battlefield
         assertPermanentCount(playerA, "Silent Artisan", 1);
@@ -73,7 +72,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silent Artisan", 1);
         assertPowerToughness(playerA, "Silent Artisan", 4, 6);
@@ -103,7 +101,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // because Boon Satyr is no creature on the battlefield, evolve may not trigger
         assertPermanentCount(playerA, "Boon Satyr", 1);
@@ -135,7 +132,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // because Boon Satyr is no creature on the battlefield, evolve may not trigger
         assertLife(playerA, 20);
@@ -171,7 +167,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // because Boon Satyr is no creature on the battlefield, evolve may not trigger
         assertPermanentCount(playerA, "Silent Artisan", 1);
@@ -225,7 +220,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, "Cyclops of One-Eyed Pass", 1);
         assertHandCount(playerB, 0);
@@ -268,7 +262,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         //
         assertHandCount(playerA, "Hypnotic Siren", 0);
@@ -306,7 +299,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 18); // -2 from Chandra's Outrage
         assertLife(playerB, 18); // -2 from attack of Mogis's Warhound
@@ -365,7 +357,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 18); // -2 from Chandra's Outrage
         assertLife(playerA, 16); // -3 from attack Alesha with bestowed Nighthowler
@@ -394,7 +385,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20);
         assertTapped("Sightless Brawler", false);
@@ -417,7 +407,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 15);
         assertTapped("Sightless Brawler", true);
@@ -440,7 +429,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, "Sightless Brawler", 0);
         assertLife(playerB, 20);
@@ -467,7 +455,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, "Sightless Brawler", 0);
         assertLife(playerB, 14);
@@ -505,7 +492,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Song of the Dryads", 1);
 
@@ -538,7 +524,6 @@ public class BestowTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Nylea's Emissary", 1);
         assertPowerToughness(playerA, "Silvercoat Lion", 5, 5);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BlitzTest.java

@@ -46,7 +46,6 @@ public class BlitzTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, decoy, 1);
         assertBlitzed(decoy, true);
@@ -62,7 +61,6 @@ public class BlitzTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, decoy, 0);
         assertGraveyardCount(playerA, decoy, 1);
@@ -79,7 +77,6 @@ public class BlitzTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, decoy, 1);
         assertBlitzed(decoy, false);
@@ -119,7 +116,6 @@ public class BlitzTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertBlitzed(underdog, true);
         assertLife(playerA, 20 - 2);
@@ -137,7 +133,6 @@ public class BlitzTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertBlitzed(underdog, false);
         assertLife(playerA, 20);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BolsterTest.java

@@ -33,7 +33,6 @@ public class BolsterTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount("Elite Scaleguard", CounterType.P1P1, 2);
         assertPowerToughness(playerA, "Elite Scaleguard", 4, 5);
@@ -53,7 +52,6 @@ public class BolsterTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
 
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Elite Scaleguard", 2, 3);
         assertCounterCount("Silvercoat Lion", CounterType.P1P1, 2);
@@ -79,7 +77,6 @@ public class BolsterTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Elite Scaleguard", 2, 3);
         assertCounterCount("Silvercoat Lion", CounterType.P1P1, 2);
@@ -115,7 +112,6 @@ public class BolsterTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Elite Scaleguard", 2, 3);
         assertCounterCount("Silvercoat Lion", CounterType.P1P1, 2);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java

@@ -28,7 +28,6 @@ public class BuybackTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Silvercoat Lion", 4, 4);
         assertHandCount(playerA, "Elvish Fury", 1);
@@ -49,7 +48,6 @@ public class BuybackTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); - AI must choose
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Silvercoat Lion", 4, 4);
         assertHandCount(playerA, "Elvish Fury", 1);
@@ -155,6 +153,5 @@ public class BuybackTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CompleatedTest.java

@@ -24,7 +24,6 @@ public class CompleatedTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerA, tamiyo, CounterType.LOYALTY, 3);
     }
@@ -40,7 +39,6 @@ public class CompleatedTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerA, tamiyo, CounterType.LOYALTY, 5);
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConniveTest.java

@@ -30,7 +30,6 @@ public class ConniveTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Hypnotic Grifter", 1, 2); // Discarded a land card
         assertHandCount(playerA, 1); // 1 from drawing at start of turn
@@ -56,7 +55,6 @@ public class ConniveTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Hypnotic Grifter", 2, 3); // Discarded a non-land
         assertHandCount(playerA, 1); // 1 from drawing at start of turn
@@ -86,7 +84,6 @@ public class ConniveTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Hypnotic Grifter", 2, 3); // Discarded a non-land
         assertHandCount(playerA, 1); // 1 from drawing at start of turn
@@ -130,7 +127,6 @@ public class ConniveTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
 
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerB, "Crazed Goblin", 1, 1); // Discarded only lands
         assertGraveyardCount(playerB, "Plains", 3);
@@ -172,7 +168,6 @@ public class ConniveTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
 
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 1); // Drew a card at start of turn
         assertHandCount(playerB, "Sol Ring", 1); // Returned by Psychic Pickpocket's ability

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java

@@ -97,7 +97,6 @@ public class ConspireTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Wort, the Raidmother", 1);
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
@@ -131,7 +130,6 @@ public class ConspireTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Wort, the Raidmother", 1);
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
@@ -260,7 +258,6 @@ public class ConspireTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Burn Trail", 1);
         assertLife(playerB, 20 - 3 - 3);
@@ -285,7 +282,6 @@ public class ConspireTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); - AI must choose
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Burn Trail", 1);
         assertLife(playerB, 20 - 3 - 3);
@@ -310,7 +306,6 @@ public class ConspireTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); - AI must choose
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Burn Trail", 1);
         assertLife(playerB, 20 - 3); // simple cast

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java

@@ -24,7 +24,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -40,7 +39,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -56,7 +54,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -73,7 +70,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -90,7 +86,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -116,7 +111,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 4);
     }
@@ -136,7 +130,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         //setStrictChooseMode(true); AI must choose targets
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 4);
     }
@@ -160,7 +153,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 4);
     }
@@ -180,7 +172,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 4);
     }
@@ -202,7 +193,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);
@@ -231,7 +221,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);
@@ -255,7 +244,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Alpha Myr", 1);
     }
@@ -291,7 +279,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -312,7 +299,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Hogaak, Arisen Necropolis", 1);
     }
@@ -337,7 +323,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Hogaak, Arisen Necropolis", 1);
     }
@@ -361,7 +346,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Soldier Token", 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CrewTest.java

@@ -43,7 +43,6 @@ public class CrewTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertTappedCount(lion, true, 2);
         assertPowerToughness(playerA, caravan, 5, 5);
@@ -64,7 +63,6 @@ public class CrewTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertTappedCount(fanatic, true, 1);
         assertPowerToughness(playerA, copter, 3, 3);
@@ -90,7 +88,6 @@ public class CrewTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // Only crewed vehicles have card type creature
         assertNotType(copter, CardType.CREATURE);
@@ -105,7 +102,6 @@ public class CrewTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertTapped(ox, true);
         assertType(plow, CardType.CREATURE, true);
@@ -120,7 +116,6 @@ public class CrewTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertTapped(kotori, true);
         assertType(crusher, CardType.ARTIFACT, true);
@@ -136,7 +131,6 @@ public class CrewTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertTapped(mechanic, true);
         assertType(express, CardType.ARTIFACT, true);
@@ -152,7 +146,6 @@ public class CrewTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerA, jace, CounterType.LOYALTY, 2);
         assertType(heart, CardType.ARTIFACT, true);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java

@@ -39,8 +39,6 @@ public class CumulativeUpkeepTest extends CardTestPlayerBase {
         setStopAt(7, PhaseStep.BEGIN_COMBAT);
         execute();
 
-        assertAllCommandsUsed();
-        
         assertGraveyardCount(playerA, "Phobian Phantasm", 1);
         
         assertLife(playerA, 20);
@@ -95,8 +93,6 @@ public class CumulativeUpkeepTest extends CardTestPlayerBase {
         setStopAt(5, PhaseStep.BEGIN_COMBAT);
         execute();
 
-        assertAllCommandsUsed();
-        
         assertLife(playerA, 40);
         assertLife(playerB, 21);  
         

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DayNightTest.java

@@ -54,7 +54,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(true);
     }
@@ -70,7 +69,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(false);
     }
@@ -86,7 +84,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(false);
     }
@@ -103,7 +100,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(true);
     }
@@ -120,7 +116,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(true);
         assertPermanentCount(playerA, outcasts, 0);
@@ -140,7 +135,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertDayNight(true);
         assertPowerToughness(playerA, smasher, 6 + 1, 5 + 1);
@@ -170,7 +164,6 @@ public class DayNightTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(true);
     }
@@ -195,7 +188,6 @@ public class DayNightTest extends CardTestPlayerBase {
 
         setStopAt(3, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(false);
     }
@@ -225,7 +217,6 @@ public class DayNightTest extends CardTestPlayerBase {
 
         setStopAt(3, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertRuffianSmasher(false);
     }
@@ -240,7 +231,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertDayNight(true);
         Permanent permanent = getPermanent(curse);
@@ -259,7 +249,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertDayNight(false);
         assertPermanentCount(playerA, curse, 0);
@@ -277,7 +266,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertDayNight(false);
         assertPermanentCount(playerA, curse, 0);
@@ -297,7 +285,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertDayNight(true);
         Permanent permanent = getPermanent(curse);
@@ -315,7 +302,6 @@ public class DayNightTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertDayNight(true);
         assertLife(playerB, 20);
@@ -341,7 +327,6 @@ public class DayNightTest extends CardTestPlayerBase {
 
         setStopAt(4, PhaseStep.UPKEEP);
         execute();
-        assertAllCommandsUsed();
 
         assertDayNight(true);
         assertLife(playerB, 20 - 1 - 3 - 3 - 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java

@@ -18,7 +18,6 @@ public class DecayedTest extends CardTestPlayerBase {
         setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
-        assertAllCommandsUsed();
         assertPermanentCount(playerA, "Falcon Abomination", 1);
         assertPermanentCount(playerA, "Zombie Token", 0);
     }
@@ -40,7 +39,6 @@ public class DecayedTest extends CardTestPlayerBase {
         setStopAt(5, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
-        assertAllCommandsUsed();
         assertPermanentCount(playerA, "Gisa, Glorious Resurrector", 1);
         assertPermanentCount(playerA, "Grizzly Bears", 0);
         assertPermanentCount(playerB, "Grizzly Bears", 0);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java

@@ -37,7 +37,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerA, "Balduvian Bears", 4);
         assertGraveyardCount(playerA, "Descend upon the Sinful", 1);
@@ -70,7 +69,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerA, "Balduvian Bears", 4);
         assertGraveyardCount(playerA, "Descend upon the Sinful", 1);
@@ -110,7 +108,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 0);
         assertExileCount(playerA, "Balduvian Bears", 4);
@@ -145,7 +142,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 0);
         assertExileCount(playerA, "Balduvian Bears", 4);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DelveTest.java

@@ -41,7 +41,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Ethereal Forager", 1);
     }
@@ -60,7 +59,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps {
         //setStrictChooseMode(true); AI must choose targets
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Ethereal Forager", 1);
     }
@@ -78,7 +76,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Ethereal Forager", 1);
     }
@@ -114,7 +111,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 1); // no resolve, so no draw cards (if rollback bug active then it shows 3 cards)
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DisturbTest.java

@@ -69,7 +69,6 @@ public class DisturbTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     /**
@@ -108,7 +107,6 @@ public class DisturbTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     /**
@@ -128,7 +126,6 @@ public class DisturbTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     /**
@@ -164,7 +161,6 @@ public class DisturbTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     /**
@@ -199,7 +195,6 @@ public class DisturbTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     /**
@@ -222,14 +217,12 @@ public class DisturbTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
         assertPermanentCount(playerA, ghastlyMimictry, 1);
 
         castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, lightningBolt, "Alloy Myr");
 
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
         assertExileCount(mirrorhallMimic, 1);
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java

@@ -57,7 +57,6 @@ public class EchoTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java

@@ -30,7 +30,6 @@ public class EntwineTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertPermanentCount(playerA, "Balduvian Bears", 0);
@@ -56,7 +55,6 @@ public class EntwineTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 - 3);
         assertPermanentCount(playerA, "Balduvian Bears", 0);
@@ -84,7 +82,6 @@ public class EntwineTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 - 3);
         assertPermanentCount(playerA, "Balduvian Bears", 0);
@@ -112,7 +109,6 @@ public class EntwineTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 - 3);
         assertPermanentCount(playerA, "Balduvian Bears", 0);
@@ -142,7 +138,6 @@ public class EntwineTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 - 3);
         assertPermanentCount(playerA, "Balduvian Bears", 0);
@@ -170,7 +165,6 @@ public class EntwineTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPermanentCount(playerA, "Pillarfield Ox", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java

@@ -21,7 +21,6 @@ public class EpicTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(7, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Snake Token", 3 + 3 + 4 + 5);
         assertPermanentCount(playerA, "Forest", 8);
@@ -39,7 +38,6 @@ public class EpicTest extends CardTestPlayerBase {
 
         setStopAt(7, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Snake Token", 2 * (3 + 3 + 4 + 5));
         assertPermanentCount(playerA, "Tropical Island", 10);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java

@@ -171,7 +171,6 @@ public class EvolveTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java

@@ -564,7 +564,6 @@ public class FlashbackTest extends CardTestPlayerBase {
         // TODO: Can't use checkPlayableAbility on Force of Will in this case.
         try {
             execute();
-            assertAllCommandsUsed();
 
             Assert.fail("must throw exception on execute");
         } catch (Throwable e) {
@@ -655,6 +654,5 @@ public class FlashbackTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForetellTest.java

@@ -26,7 +26,6 @@ public class ForetellTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
-        assertAllCommandsUsed();
         assertExileCount(playerA, "Behold the Multiverse", 1);
 
     }
@@ -42,7 +41,6 @@ public class ForetellTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
-        assertAllCommandsUsed();
         assertExileCount(playerA, "Behold the Multiverse", 1); // still in exile because it can't be cast the same turn
     }
 
@@ -57,7 +55,6 @@ public class ForetellTest extends CardTestPlayerBase {
         setStopAt(2, PhaseStep.END_TURN);
         execute();
 
-        assertAllCommandsUsed();
         assertExileCount(playerA, "Behold the Multiverse", 0); // no longer in exile
         assertGraveyardCount(playerA, "Behold the Multiverse", 1);  // now in graveyard
         assertHandCount(playerA, 2); // 2 cards drawn
@@ -77,7 +74,6 @@ public class ForetellTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
-        assertAllCommandsUsed();
         assertExileCount(playerA, "Sol Talisman", 1); // suspend card in exile
         assertExileCount(playerA, "Lightning Bolt", 1); // foretold card in exile
         assertPowerToughness(playerA, "Dream Devourer", 2, 3);  // +2 power boost from trigger due to foretell of Lightning Bolt

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GoadTest.java

@@ -10,7 +10,6 @@ import mage.game.GameException;
 import mage.game.mulligan.MulliganType;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
-import mage.util.functions.Function;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mage.test.player.TestPlayer;
@@ -119,7 +118,6 @@ public class GoadTest extends CardTestMultiPlayerBase {
 
         setStopAt(2, PhaseStep.DECLARE_BLOCKERS);
         execute();
-        assertAllCommandsUsed();
 
         assertGoaded(lion, playerA);
         assertAttacking(lion, playerB, playerC);
@@ -138,7 +136,6 @@ public class GoadTest extends CardTestMultiPlayerBase {
 
         setStopAt(2, PhaseStep.DECLARE_BLOCKERS);
         execute();
-        assertAllCommandsUsed();
 
         assertGoaded(lion, playerA);
         assertAttacking(lion, playerC);
@@ -158,7 +155,6 @@ public class GoadTest extends CardTestMultiPlayerBase {
 
         setStopAt(2, PhaseStep.DECLARE_BLOCKERS);
         execute();
-        assertAllCommandsUsed();
 
         assertGoaded(lion, playerA);
         assertAttacking(lion, playerA);
@@ -182,7 +178,6 @@ public class GoadTest extends CardTestMultiPlayerBase {
 
         setStopAt(3, PhaseStep.DECLARE_BLOCKERS);
         execute();
-        assertAllCommandsUsed();
 
         assertGoaded(lion, playerA, playerD);
         assertAttacking(lion, playerB);
@@ -207,7 +202,6 @@ public class GoadTest extends CardTestMultiPlayerBase {
 
         setStopAt(3, PhaseStep.DECLARE_BLOCKERS);
         execute();
-        assertAllCommandsUsed();
 
         assertGoaded(lion, playerA, playerD);
         assertAttacking(lion, playerA, playerD);
@@ -219,7 +213,6 @@ public class GoadTest extends CardTestMultiPlayerBase {
 
         setStopAt(1, PhaseStep.DECLARE_BLOCKERS);
         execute();
-        assertAllCommandsUsed();
 
         assertAttacking("Berserkers of Blood Ridge", playerB, playerC, playerD);
     }
@@ -253,7 +246,6 @@ public class GoadTest extends CardTestMultiPlayerBase {
         setStopAt(2, PhaseStep.DECLARE_BLOCKERS);
 
         execute();
-        assertAllCommandsUsed();
 
         assertGoaded("Goblin Balloon Brigade", playerA);
         assertNotGoaded("Goblin Champion", playerA);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HexproofTest.java

@@ -127,7 +127,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Swamp", 1);
         assertCounterCount(playerA, "Liliana Vess", CounterType.LOYALTY, 5 + 1);
@@ -154,7 +153,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps {
 
         try {
             execute();
-            assertAllCommandsUsed();
             Assert.fail("must throw exception on execute");
         } catch (Throwable e) {
             if (!e.getMessage().contains("setup good targets")) {
@@ -181,7 +179,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no discarded cards
         assertGraveyardCount(playerA, 0);
@@ -212,7 +209,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no discarded cards
         assertGraveyardCount(playerA, 0);
@@ -231,7 +227,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 3 * 3);
     }
@@ -265,6 +260,5 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(3, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java

@@ -45,7 +45,6 @@ public class HideawayTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Shelldock Isle", 1);
         assertExileCount(playerA, "Silvercoat Lion", 1);
@@ -87,7 +86,6 @@ public class HideawayTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount("Dross Crocodile", 2);
         assertPermanentCount(playerA, "Mosswort Bridge", 1);
@@ -132,7 +130,6 @@ public class HideawayTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Ghost Quarter", 0);
         assertTapped("Windbrisk Heights", true);
@@ -191,7 +188,6 @@ public class HideawayTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Ghost Quarter", 1);
         assertTapped("Windbrisk Heights", true);
@@ -225,7 +221,6 @@ public class HideawayTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Ghost Quarter", 1);
         assertTapped("Windbrisk Heights", true);
@@ -265,7 +260,6 @@ public class HideawayTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertTappedCount("Island", true, 1);
         assertPermanentCount(playerA, sIsle, 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ImproviseTest.java

@@ -35,7 +35,6 @@ public class ImproviseTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Bastion Inventor", 1);
     }
@@ -54,7 +53,6 @@ public class ImproviseTest extends CardTestPlayerBaseWithAIHelps {
         //setStrictChooseMode(true); AI must choose targets
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Bastion Inventor", 1);
     }
@@ -72,7 +70,6 @@ public class ImproviseTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Bastion Inventor", 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java

@@ -60,7 +60,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Aether Figment", 1);
         assertCounterCount("Aether Figment", CounterType.P1P1, 2);
@@ -80,7 +79,6 @@ public class KickerTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); - AI must choose
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Aether Figment", 1);
         assertCounterCount("Aether Figment", CounterType.P1P1, 2);
@@ -98,7 +96,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Aether Figment", 1);
         assertCounterCount("Aether Figment", CounterType.P1P1, 0);
@@ -118,7 +115,6 @@ public class KickerTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); - AI must choose
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Aether Figment", 1);
         assertCounterCount("Aether Figment", CounterType.P1P1, 0);
@@ -143,7 +139,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Apex Hawks", 1);
         assertCounterCount("Apex Hawks", CounterType.P1P1, 1);
@@ -164,7 +159,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Apex Hawks", 1);
         assertCounterCount("Apex Hawks", CounterType.P1P1, 2);
@@ -182,7 +176,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Apex Hawks", 1);
         assertCounterCount("Apex Hawks", CounterType.P1P1, 0);
@@ -206,7 +199,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Sunscape Battlemage", 1);
         assertHandCount(playerA, 2);
@@ -234,7 +226,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Birds of Paradise", 1);
         assertPermanentCount(playerA, "Sunscape Battlemage", 1);
@@ -271,7 +262,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerB, "Birds of Paradise", 1);
         assertGraveyardCount(playerB, "Ertai's Trickery", 1);
@@ -305,7 +295,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerA, "Hallar, the Firefletcher", CounterType.P1P1, 1);
         assertLife(playerB, 20 - 2 - 1); // 2 damage from kicked spell, 1 damage from hallar's trigger
@@ -346,7 +335,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Boomerang", 1);
         assertGraveyardCount(playerB, "Birds of Paradise", 1);
@@ -393,7 +381,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 - 2 * 2);
     }
@@ -451,7 +438,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // cast spell - countered
         // copied spell - resolved (2 damage)
@@ -497,7 +483,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
 
         // cast spell - countered
@@ -550,7 +535,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
     }
 
     /**
@@ -582,7 +566,6 @@ public class KickerTest extends CardTestPlayerBase {
 
         try {
             execute();
-            assertAllCommandsUsed();
 
             Assert.fail("must throw exception on execute");
         } catch (Throwable e) {
@@ -622,7 +605,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         Assert.assertEquals("All mana has to be used", "[]", playerA.getManaAvailable(currentGame).toString());
         assertGraveyardCount(playerB, "Lightning Bolt", 1);
@@ -653,7 +635,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertTappedCount("Swamp", true, 5);
         assertGraveyardCount(playerA, "Marsh Casualties", 1);
@@ -683,7 +664,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerA, "Ardent Soldier", CounterType.P1P1, 1); // from kicker
     }
@@ -717,7 +697,6 @@ public class KickerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Brain in a Jar", 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java

@@ -29,7 +29,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2);
         assertLife(playerA, 20);
@@ -57,7 +56,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2);
         assertLife(playerA, 20 + 4);
@@ -87,7 +85,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2);
         assertLife(playerA, 20 + 4);
@@ -117,7 +114,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2);
         assertLife(playerA, 20 + 4);
@@ -149,7 +145,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2);
         assertLife(playerA, 20 + 4);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java

@@ -31,7 +31,6 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -57,7 +56,6 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -85,7 +83,6 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
     }
 
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java

@@ -49,7 +49,6 @@ public class MadnessTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Arrogant Wurm", 1);
         assertGraveyardCount(playerA, "Raven's Crime", 1);
@@ -70,7 +69,6 @@ public class MadnessTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Arrogant Wurm", 0);
         assertGraveyardCount(playerA, "Raven's Crime", 1);
@@ -130,7 +128,6 @@ public class MadnessTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Haunting Hymn", 1);
         assertGraveyardCount(playerA, "Avacyn's Judgment", 1);
@@ -185,7 +182,6 @@ public class MadnessTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Falkenrath Gorger", 1);
         assertPermanentCount(playerA, "Asylum Visitor", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java

@@ -33,7 +33,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -66,7 +65,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -102,7 +100,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -141,7 +138,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -178,7 +174,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -221,7 +216,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -260,7 +254,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(2, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -303,7 +296,6 @@ public class ManifestTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -342,7 +334,6 @@ public class ManifestTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -383,7 +374,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -419,7 +409,6 @@ public class ManifestTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -468,7 +457,6 @@ public class ManifestTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         // no life gain
         assertLife(playerA, 20);
@@ -520,7 +508,6 @@ public class ManifestTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
       // no life gain
         assertLife(playerA, 20);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MeldTest.java

@@ -39,7 +39,6 @@ public class MeldTest extends CardTestPlayerBase {
 
         try {
             execute();
-            assertAllCommandsUsed();
 
             Assert.fail("must throw exception on execute");
         } catch (Throwable e) {

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java

@@ -161,7 +161,6 @@ public class ModularTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Arcbound Lancer", 1);
         assertGraveyardCount(playerA, "Puncture Blast", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java

@@ -363,7 +363,6 @@ public class MorphTest extends CardTestPlayerBase {
         // showBattlefield("A battle after", 1, PhaseStep.END_TURN, playerA);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20);
 
@@ -700,7 +699,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Reflector Mage", 1);
         assertPermanentCount(playerB, "Rattleclaw Mystic", 0);
@@ -793,7 +791,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Brine Elemental", 1);
         assertPermanentCount(playerB, "Brine Elemental", 1);
@@ -968,8 +965,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
-        assertAllCommandsUsed();
-
         assertPermanentCount(playerA, "Zoetic Cavern", 1);
     }
 
@@ -987,7 +982,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Zoetic Cavern", 0);
         assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1);
@@ -1015,7 +1009,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Island", 1);
         assertPermanentCount(playerA, "Zoetic Cavern", 0);
@@ -1041,7 +1034,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Zoetic Cavern", 0);
         assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1);
@@ -1065,7 +1057,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -1086,7 +1077,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1);
     }
@@ -1109,7 +1099,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1);
     }
@@ -1141,7 +1130,6 @@ public class MorphTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(3, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java

@@ -69,7 +69,6 @@ public class OfferingTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
-        assertAllCommandsUsed();
         assertPermanentCount(playerA, patron, 1);
         
         assertGraveyardCount(playerA, "Akki Drillmaster", 1);
@@ -99,7 +98,6 @@ public class OfferingTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
-        assertAllCommandsUsed();
         assertPermanentCount(playerA, patron, 1);
         
         assertGraveyardCount(playerA, "Boros Recruit", 1);
@@ -132,7 +130,6 @@ public class OfferingTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
-        assertAllCommandsUsed();
         assertPermanentCount(playerA, patron, 1);
         
         assertGraveyardCount(playerA, "Boggart Ram-Gang", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OverloadTest.java

@@ -38,7 +38,6 @@ public class OverloadTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Vandalblast", 1);
         assertGraveyardCount(playerB, "Mental Misstep", 1);
@@ -67,7 +66,6 @@ public class OverloadTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Cyclonic Rift", 1);
         assertPermanentCount(playerB, "Swamp", 1);
@@ -96,7 +94,6 @@ public class OverloadTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Cyclonic Rift", 1);
         assertPermanentCount(playerB, "Swamp", 1);
@@ -141,7 +138,6 @@ public class OverloadTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerA, "Cyclonic Rift", 1);
         assertGraveyardCount(playerA, "Cyclonic Rift", 0); // imprinted copy discarded

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java

@@ -34,7 +34,6 @@ public class ProwlTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 19);
         assertPermanentCount(playerA, "Bloodmark Mentor", 1);
@@ -70,7 +69,6 @@ public class ProwlTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 18);
         assertPermanentCount(playerA, "Goblin Warchief", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java

@@ -64,7 +64,7 @@ public class ReboundTest extends CardTestPlayerBase {
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Distortion Strike", "Memnite");
 
         setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
-        execute();assertAllCommandsUsed();
+        execute();
 
         //check exile and graveyard        
         assertPowerToughness(playerA, "Memnite", 2, 1);
@@ -133,7 +133,6 @@ public class ReboundTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         //check exile and graveyard        
         assertGraveyardCount(playerB, "Lightning Bolt", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java

@@ -99,7 +99,6 @@ public class ReplicateTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 3); // 1 + 2 replicates
     }
@@ -124,7 +123,6 @@ public class ReplicateTest extends CardTestPlayerBase {
         //setStrictChooseMode(true); - AI must choice
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 3); // 1 + 2 replicates
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java

@@ -35,7 +35,6 @@ public class RiotTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
 
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Rampaging Rendhorn", 1);
         assertPowerToughness(playerA, "Rampaging Rendhorn", 5, 5);
@@ -56,7 +55,6 @@ public class RiotTest extends CardTestPlayerBase {
         setStopAt(2, PhaseStep.BEGIN_COMBAT);
 
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Rampaging Rendhorn", 1);
         assertPowerToughness(playerA, "Rampaging Rendhorn", 4, 4);
@@ -81,7 +79,6 @@ public class RiotTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPowerToughness(playerA, "Silvercoat Lion", 3, 3);
@@ -109,7 +106,6 @@ public class RiotTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPowerToughness(playerA, "Silvercoat Lion", 2 + 2, 2 + 2);
@@ -135,7 +131,6 @@ public class RiotTest extends CardTestPlayerBase {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPowerToughness(playerA, "Silvercoat Lion", 2, 2);
@@ -161,7 +156,6 @@ public class RiotTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
 
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPowerToughness(playerA, "Silvercoat Lion", 3, 3);
@@ -187,7 +181,6 @@ public class RiotTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
 
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
         assertPowerToughness(playerA, "Silvercoat Lion", 2, 2);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SupportTest.java

@@ -31,7 +31,6 @@ public class SupportTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Silvercoat Lion", 2 + 1, 2 + 1);
         assertPowerToughness(playerA, "Pillarfield Ox", 2 + 1, 4 + 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SuspendTest.java

@@ -233,7 +233,6 @@ public class SuspendTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(7, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -268,7 +267,6 @@ public class SuspendTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(7, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -311,7 +309,6 @@ public class SuspendTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(7, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -345,7 +342,6 @@ public class SuspendTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerB, "Mox Tantalite", 1); // suspended
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java

@@ -173,7 +173,6 @@ public class TransformTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, 13);
         assertGraveyardCount(playerA, "Startled Awake", 0);
@@ -198,7 +197,6 @@ public class TransformTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, 13);
         assertGraveyardCount(playerA, "Startled Awake", 0);
@@ -308,7 +306,6 @@ public class TransformTest extends CardTestPlayerBase {
 
         setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
         assertGraveyardCount(playerA, "Silvercoat Lion", 1);
@@ -489,7 +486,6 @@ public class TransformTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Delver of Secrets", 1);
         assertPermanentCount(playerA, "Insectile Aberration", 0);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/WardTest.java

@@ -30,6 +30,5 @@ public class WardTest extends CardTestPlayerBase {
         assertExileCount("Healer's Hawk", 1);
         assertGraveyardCount(playerA, "Solitude", 1);
         assertPermanentCount(playerB, "Waterfall Aerialist", 1);
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java

@@ -26,7 +26,6 @@ public class ConditionalOneShotEffectTest extends CardTestPlayerBase {
         
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Unlicensed Disintegration", 1);
         assertGraveyardCount(playerB, "Silvercoat Lion", 1);
@@ -61,7 +60,6 @@ public class ConditionalOneShotEffectTest extends CardTestPlayerBase {
         
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Unlicensed Disintegration", 1);
         assertGraveyardCount(playerB, "Silvercoat Lion", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java

@@ -151,7 +151,6 @@ public class AddingCountersToPermanentsTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Lightning Bolt", 1);
         assertPowerToughness(playerA, "Kitchen Finks", 2, 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java

@@ -88,8 +88,6 @@ public class CounterspellTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
-        assertAllCommandsUsed();
-
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
         assertGraveyardCount(playerA, "Twincast", 1);
 
@@ -124,8 +122,6 @@ public class CounterspellTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
-        assertAllCommandsUsed();
-
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
         assertGraveyardCount(playerA, "Twincast", 1);
 
@@ -160,8 +156,6 @@ public class CounterspellTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
-        assertAllCommandsUsed();
-
         assertGraveyardCount(playerA, "Lightning Bolt", 1);
         assertGraveyardCount(playerA, "Twincast", 1);
 

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java

@@ -37,7 +37,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Disrupting Shoal", 1);
         assertGraveyardCount(playerA, "Silvercoat Lion", 1);
@@ -60,7 +59,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerB, "Disrupting Shoal", 1);
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
@@ -103,7 +101,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);
@@ -145,7 +142,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost
         assertGraveyardCount(playerB, "Disrupting Shoal", 1);
@@ -177,7 +173,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost
         assertGraveyardCount(playerB, "Disrupting Shoal", 1);
@@ -209,7 +204,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost
         assertGraveyardCount(playerB, "Disrupting Shoal", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ForceOfWillTest.java

@@ -73,7 +73,6 @@ public class ForceOfWillTest extends CardTestPlayerBase {
         // TODO: Needed since the alternative cost is not being properly check for playability.
         try {
             execute();
-            assertAllCommandsUsed();
             Assert.fail("must throw exception on execute");
         } catch (Throwable e) {
             if (!e.getMessage().contains("Can't find available command - activate:Cast Force of Will$target=Thoughtseize")) {

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java

@@ -37,7 +37,6 @@ public class NotOfThisWorldTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerB, "Not of This World", 0);
         assertGraveyardCount(playerB, "Not of This World", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/UnlicensedDisintegrationTest.java

@@ -43,7 +43,6 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{
         
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertGraveyardCount(playerA, "Unlicensed Disintegration", 1);
@@ -69,7 +68,6 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{
         
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertGraveyardCount(playerA, "Unlicensed Disintegration", 1);
@@ -93,7 +91,6 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{
         
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertGraveyardCount(playerA, "Unlicensed Disintegration", 1);
@@ -116,7 +113,6 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{
         
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertGraveyardCount(playerA, "Unlicensed Disintegration", 1);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java

@@ -34,7 +34,6 @@ public class WrathOfGodTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Silvercoat Lion", 0);
         assertPermanentCount(playerA, "Mossbridge Troll", 0);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java

@@ -85,8 +85,6 @@ public class ChorusOfTheConclaveTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
-        assertAllCommandsUsed();
-
         assertPermanentCount(playerA, "Goblin Roughrider", 1); // costs {R}{2} + {1} = 4
         assertCounterCount("Goblin Roughrider", CounterType.P1P1, 1);
 

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/FeatherTheRedeemedTest.java

@@ -42,7 +42,6 @@ public class FeatherTheRedeemedTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -79,7 +78,6 @@ public class FeatherTheRedeemedTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test
@@ -116,6 +114,5 @@ public class FeatherTheRedeemedTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainAbilitiesTest.java

@@ -33,7 +33,6 @@ public class GainAbilitiesTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         Permanent permanent = getPermanent("Balduvian Bears");
         Assert.assertEquals("must have only 1 singleton ability instance from two attachments",
@@ -58,7 +57,6 @@ public class GainAbilitiesTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         Permanent permanent = getPermanent("Balduvian Bears");
         Assert.assertEquals("must have 2 dynamic ability instances from two attachments",

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java

@@ -49,7 +49,6 @@ public class GainMenaceAbilityAsSingletonTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         Permanent permanent = getPermanent("Minotaur", playerA);
         Assert.assertEquals("must have only 1 Menace instance", 1, permanent.getAbilities(currentGame).stream()

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ImpelledGiantTest.java

@@ -21,8 +21,6 @@ public class ImpelledGiantTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
 
-        assertAllCommandsUsed();
-
         assertTapped("Hurloon Minotaur", true);
         assertPowerToughness(playerA, "Impelled Giant", 5, 3);
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/MycosynthGolemTest.java

@@ -34,7 +34,6 @@ public class MycosynthGolemTest extends CardTestCommander4Players {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Alpha Myr", 1);
         assertHandCount(playerA, "Alpha Myr", 0);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/OathOfKayaTest.java

@@ -25,7 +25,6 @@ public class OathOfKayaTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerB, "Liliana, Dreadhorde General", CounterType.LOYALTY, 6);
         assertLife(playerA, 20);
@@ -47,7 +46,6 @@ public class OathOfKayaTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerB, "Liliana, Dreadhorde General", CounterType.LOYALTY, 6 - 2 * 2);
         assertLife(playerA, 20 - 2);
@@ -70,7 +68,6 @@ public class OathOfKayaTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerB, "Liliana, Dreadhorde General", CounterType.LOYALTY, 6 - 2);
         assertCounterCount(playerB, "Vivien, Champion of the Wilds", CounterType.LOYALTY, 4 - 2);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/PaupersCageTest.java

@@ -24,7 +24,6 @@ public class PaupersCageTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);
@@ -40,7 +39,6 @@ public class PaupersCageTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);
@@ -56,7 +54,6 @@ public class PaupersCageTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2);
@@ -72,7 +69,6 @@ public class PaupersCageTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(4, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 2 * 2);

Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java

@@ -29,7 +29,6 @@ public class RielleTheEverwiseTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 5);
 
@@ -48,7 +47,6 @@ public class RielleTheEverwiseTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 3);
 
@@ -69,7 +67,6 @@ public class RielleTheEverwiseTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 3);
 

Mage.Tests/src/test/java/org/mage/test/cards/asthough/AsThoughManaAndAITest.java

@@ -27,7 +27,6 @@ public class AsThoughManaAndAITest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerB, 20 - 3);
     }

Mage.Tests/src/test/java/org/mage/test/cards/asthough/DidNotHaveHexproofTest.java

@@ -44,6 +44,5 @@ public class DidNotHaveHexproofTest extends CardTestPlayerBase {
         assertTapped(dTower, true);
         assertGraveyardCount(playerA, "Shock", 1);
         assertLife(playerB, 18);
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/asthough/IntetTheDreamerTest.java

@@ -45,7 +45,6 @@ public class IntetTheDreamerTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPowerToughness(playerA, "Intet, the Dreamer", 6 + 2, 6 + 2); // boost from Wax
     }

Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java

@@ -154,7 +154,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Swamp", 1);
         assertGraveyardCount(playerA, "Forest", 1);
@@ -187,7 +186,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(2, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Swamp", 1);
         assertGraveyardCount(playerA, "Forest", 1);
@@ -258,7 +256,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Mountain", 2);
         assertPermanentCount(playerA, "Silvercoat Lion", 0);
@@ -305,7 +302,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Mountain", 2);
         assertPermanentCount(playerA, "Silvercoat Lion", 1);
@@ -355,7 +351,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 15);
         assertPermanentCount(playerB, "Fallen Shinobi", 1);
@@ -407,7 +402,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 15);
         assertPermanentCount(playerB, "Fallen Shinobi", 1);
@@ -468,7 +462,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
 
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 15);
         assertPermanentCount(playerB, "Fallen Shinobi", 1);
@@ -510,7 +503,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Alpha Myr", 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayLandsFromGraveyardTest.java

@@ -41,7 +41,6 @@ public class PlayLandsFromGraveyardTest extends CardTestPlayerBaseWithAIHelps {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Island", 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayTopCardFromLibraryTest.java

@@ -29,7 +29,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Balduvian Bears", 1);
         assertLife(playerA, 20 - 2);
@@ -47,7 +46,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Balduvian Bears", 1);
     }
@@ -68,7 +66,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Scourge of Nel Toth", 1);
         assertLife(playerA, 20);
@@ -100,7 +97,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, (20 - 6) * 2);
         assertLife(playerB, 20 / 2);
@@ -120,7 +116,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 - 2);
         assertLife(playerB, 20);
@@ -145,7 +140,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Balduvian Bears", 1);
         assertLife(playerA, 20);
@@ -169,7 +163,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Swamp", 1);
         assertLife(playerA, 20);
@@ -195,7 +188,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20 * 2);
         assertLife(playerB, 20 / 2);
@@ -220,7 +212,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);

Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java

@@ -138,7 +138,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Hostage Taker", 1);
         assertTappedCount("Mountain", true, 4);
@@ -167,7 +166,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20 - 1);
@@ -203,7 +201,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Flicker", 1);
         assertLife(playerA, 20);
@@ -240,7 +237,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         Assert.assertTrue("Mana pool of conditional mana has to be empty", playerA.getManaPool().getConditionalMana().isEmpty());
         assertExileCount("Pillarfield Ox", 1);
@@ -261,7 +257,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Adriana, Captain of the Guard", 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/conditional/ConditionalAsThoughTest.java

@@ -65,7 +65,6 @@ public class ConditionalAsThoughTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -131,6 +130,5 @@ public class ConditionalAsThoughTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/conditional/FaceOfDivinityTest.java

@@ -40,6 +40,5 @@ public class FaceOfDivinityTest extends CardTestPlayerBase {
         setStopAt(1, PhaseStep.END_TURN);
         setStrictChooseMode(true);
         execute();
-        assertAllCommandsUsed();
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/conditional/LegendarySorceryTest.java

@@ -57,7 +57,6 @@ public class LegendarySorceryTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Urza's Ruinous Blast", 0);
 

Mage.Tests/src/test/java/org/mage/test/cards/conditional/ManaWasSpentToCastTest.java

@@ -5,7 +5,6 @@ import mage.abilities.keyword.HasteAbility;
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -103,7 +102,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
 
         setStopAt(2, PhaseStep.PRECOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertTapped("Silvercoat Lion", true);
     }
@@ -119,7 +117,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertAbility(playerA, "Jaded Sell-Sword", FirstStrikeAbility.getInstance(), true);
         assertAbility(playerA, "Jaded Sell-Sword", HasteAbility.getInstance(), true);
@@ -134,7 +131,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertAbility(playerA, "Jaded Sell-Sword", FirstStrikeAbility.getInstance(), false);
         assertAbility(playerA, "Jaded Sell-Sword", HasteAbility.getInstance(), false);
@@ -151,7 +147,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertCounterCount(playerA, "Verazol, the Split Current", CounterType.P1P1, 4);
         assertPowerToughness(playerA, "Verazol, the Split Current", 4, 4);
@@ -170,7 +165,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Kobolds of Kher Keep", 7);
     }
@@ -187,7 +181,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Pyretic Ritual", 1);
         assertPermanentCount(playerA, "Gray Ogre", 1);
@@ -212,7 +205,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertTapped("Isochron Scepter", true);
         assertExileCount(playerA, "Pyretic Ritual", 1);
@@ -235,7 +227,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertGraveyardCount(playerA, "Mana Drain", 1);
         assertGraveyardCount(playerA, "Gray Ogre", 1);
@@ -265,7 +256,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        assertAllCommandsUsed();
 
         assertTapped("Isochron Scepter", true);
         assertExileCount(playerA, "Mana Drain", 1);

Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java

@@ -89,7 +89,6 @@ public class TwoFacedCardEffectsTest extends CardTestPlayerBase {
         setStrictChooseMode(true);
         setStopAt(5, PhaseStep.BEGIN_COMBAT);
         execute();
-        assertAllCommandsUsed();
 
         assertHandCount(playerA, 2);
         assertHandCount(playerB, 2);