diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java
index 387e141593a..590ce9b6a77 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java
@@ -12,15 +12,15 @@ public class AuratouchedMageTest extends CardTestPlayerBase {
 
     @Test
     public void testSearch() {
-    addCard(Zone.BATTLEFIELD, playerA, "Plains", 10);
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 10);
+        addCard(Zone.HAND, playerA, "Auratouched Mage");
 
-    addCard(Zone.HAND, playerA, "Auratouched Mage");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Auratouched Mage");
+        addCard(Zone.LIBRARY, playerA, "White Ward", 1);
+        addTarget(playerA, "White Ward");
 
-    castSpell(0, PhaseStep.PRECOMBAT_MAIN, playerA, "Auratouched Mage");
-    addCard(Zone.LIBRARY, playerA, "White Ward", 1);
-    setChoice(playerA, "White ward");
-    setStopAt(0, PhaseStep.PRECOMBAT_MAIN);
-    execute();
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        assertAllCommandsUsed();
     }
-
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ReflectorMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ReflectorMageTest.java
index 5730041f0ff..72ee6078d4a 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ReflectorMageTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ReflectorMageTest.java
@@ -7,64 +7,64 @@ import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 /**
- *
  * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
  */
 
 public class ReflectorMageTest extends CardTestPlayerBase {
 
-    
+
     /**
      * Reported bug: Reflector Mage returning a creature to its owners hand is additionally
      * incorrectly preventing the Reflector Mage's owner from casting that same creature.
      */
     @Test
     public void testReflectorMageAllowsOwnerToCastCreatureReturnedOnSameTurn() {
-        
+
         // {1}{W}{U} When Reflector Mage enters the battlefield, return target creature an opponent controls to its owner's hand. 
         // That creature's owner can't cast spells with the same name as that creature until your next turn.
         addCard(Zone.HAND, playerA, "Reflector Mage"); // 2/3   
         addCard(Zone.HAND, playerA, "Bronze Sable", 1); // (2) 2/1
-        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); 
-        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);  
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
         addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
-        
+
         addCard(Zone.BATTLEFIELD, playerB, "Bronze Sable", 1);
-        
+
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reflector Mage");
         addTarget(playerA, "Bronze Sable");
-        
+
         castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Bronze Sable");
-        
+
         execute();
-        
+
         assertPermanentCount(playerB, "Bronze Sable", 0);
-        assertHandCount(playerB, "Bronze Sable", 1);    
+        assertHandCount(playerB, "Bronze Sable", 1);
         assertPermanentCount(playerA, "Reflector Mage", 1);
         assertPermanentCount(playerA, "Bronze Sable", 1);
     }
-    
+
     /**
      * Basic test to confirm the restriction effect still works on the opponent.
      */
     @Test
     public void testReflectorMageRestrictionEffect() {
-        
+
         // {1}{W}{U} When Reflector Mage enters the battlefield, return target creature an opponent controls to its owner's hand. 
         // That creature's owner can't cast spells with the same name as that creature until your next turn.
         addCard(Zone.HAND, playerA, "Reflector Mage"); // 2/3   
-        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); 
-        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);  
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
         addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
-        
+
         addCard(Zone.BATTLEFIELD, playerB, "Bronze Sable", 1); // (2) 2/1
-        
+
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reflector Mage");
         addTarget(playerA, "Bronze Sable");
-        
+
         castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Bronze Sable"); // should not be allowed
+        setStopAt(2, PhaseStep.END_TURN);
         execute();
-        
+
         assertPermanentCount(playerB, "Bronze Sable", 0);
         assertHandCount(playerB, "Bronze Sable", 1);
         assertPermanentCount(playerA, "Reflector Mage", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java
index e98ef90bceb..1036836343f 100644
--- a/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java
@@ -7,18 +7,16 @@ import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 /**
- *
  * @author LevelX2
  */
 public class NewCreaturesAreRemovedTest extends CardTestPlayerBase {
 
     /**
      * I was playing with a Tamiyo's Journal in the battlefield.
-     *
+     * <p>
      * During my turn I rollbacked. The clue generated by Tamiyo's Journal
      * stayed on battlefield and when my turn started again, it re-investigated
      * for another one.
-     *
      */
     @Test
     public void testTamiyosJournal() {
@@ -93,9 +91,9 @@ public class NewCreaturesAreRemovedTest extends CardTestPlayerBase {
         playLand(7, PhaseStep.PRECOMBAT_MAIN, playerA, "Port Town");
         attack(7, playerA, "Silvercoat Lion");
 
-        rollbackTurns(7, PhaseStep.END_TURN, playerA, 0);
+        rollbackTurns(7, PhaseStep.POSTCOMBAT_MAIN, playerA, 0);
 
-        setStopAt(7, PhaseStep.POSTCOMBAT_MAIN);
+        setStopAt(7, PhaseStep.END_TURN);
         execute();
 
         assertPermanentCount(playerA, "Port Town", 1);