diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpectacleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpectacleTest.java
index ab9795b06ca..1c305829056 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpectacleTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpectacleTest.java
@@ -13,8 +13,14 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
 public class SpectacleTest extends CardTestPlayerBase {
     @Test
     public void testWithoutSpectacleBasic() {
-        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
-        addCard(Zone.HAND, playerA, "Spikewheel Acrobat"); // {3}{R}
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1+4);
+        addCard(Zone.HAND, playerA, "Lightning Bolt"); // {R}
+        addCard(Zone.HAND, playerA, "Spikewheel Acrobat"); // {3}{R}, Spectacle {2}{R}
+
+        checkPlayableAbility("Can't cast with Spectacle yet", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Spikewheel Acrobat with spectacle", false);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB);
+        waitStackResolved(1,PhaseStep.PRECOMBAT_MAIN);
+        checkPlayableAbility("Can cast with Spectacle", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Spikewheel Acrobat with spectacle", true);
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spikewheel Acrobat");
 
@@ -23,8 +29,9 @@ public class SpectacleTest extends CardTestPlayerBase {
         execute();
 
         assertPermanentCount(playerA,"Spikewheel Acrobat",1);
-        assertTappedCount("Mountain",true,4);
+        assertTappedCount("Mountain",true,1+4);
     }
+
     @Test
     public void testWithoutSpectacleTriggerAfterDamage() {
         // Rafter Demon {2}{B}{R}
@@ -53,7 +60,7 @@ public class SpectacleTest extends CardTestPlayerBase {
     public void testWithSpectacle() {
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
         addCard(Zone.HAND, playerA, "Lightning Bolt"); // {R}
-        addCard(Zone.HAND, playerA, "Spikewheel Acrobat"); // Surge {2}{R}
+        addCard(Zone.HAND, playerA, "Spikewheel Acrobat"); // Spectacle {2}{R}
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt",playerB);
         waitStackResolved(1,PhaseStep.PRECOMBAT_MAIN);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CostTagCopyCloneTests.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CostTagCopyCloneTests.java
index 5fc7b4ec198..497e53a6e46 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CostTagCopyCloneTests.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CostTagCopyCloneTests.java
@@ -43,13 +43,13 @@ public class CostTagCopyCloneTests extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA, "Double Major");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Endless One");
-        setChoice(playerA, "X=1"); // with Kicker
+        setChoice(playerA, "X=1");
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Double Major");
         addTarget(playerA, "Endless One");
         waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone");
         setChoice(playerA, true);
-        setChoice(playerA, "Endless One"); // since Clone wasn't kicked, it's a 0/0 and dies
+        setChoice(playerA, "Endless One"); // since Clone doesn't copy X, it's a 0/0 and dies
         waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
 
 
@@ -67,7 +67,7 @@ public class CostTagCopyCloneTests extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA, "Clever Impersonator");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Defenders of Humanity");
-        setChoice(playerA, "X=1"); // with Kicker
+        setChoice(playerA, "X=1");
         waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, false);
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clever Impersonator");
@@ -91,7 +91,7 @@ public class CostTagCopyCloneTests extends CardTestPlayerBase {
 
         assertPermanentCount(playerA,"Astartes Warrior Token",0);
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Defenders of Humanity");
-        setChoice(playerA, "X=1"); // with Kicker
+        setChoice(playerA, "X=1");
 
         activateAbility(1,PhaseStep.PRECOMBAT_MAIN,playerA,
                 "{1}, {T}, Sacrifice {this}: Copy target spell you control.",