diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java b/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java
index 05733351647..121a77b2705 100644
--- a/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java
+++ b/Mage.Sets/src/mage/sets/innistrad/GeistOfSaintTraft.java
@@ -43,7 +43,6 @@ import mage.abilities.keyword.HexproofAbility;
 import mage.cards.CardImpl;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.game.permanent.token.AngelToken;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
@@ -60,11 +59,10 @@ public class GeistOfSaintTraft extends CardImpl {
         this.subtype.add("Spirit");
         this.subtype.add("Cleric");
 
-        this.color.setBlue(true);
-        this.color.setWhite(true);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
+        // Hexproof
         this.addAbility(HexproofAbility.getInstance());
         // Whenever Geist of Saint Traft attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat.
         this.addAbility(new AttacksTriggeredAbility(new GeistOfSaintTraftEffect(), false));
@@ -97,7 +95,7 @@ class GeistOfSaintTraftEffect extends OneShotEffect {
         if (controller != null && token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId(), true, true)) {
             Effect effect = new ExileTargetEffect();
             effect.setTargetPointer(new FixedTarget(token.getLastAddedToken()));
-            CreateDelayedTriggeredAbilityEffect createEffect = new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect));
+            CreateDelayedTriggeredAbilityEffect createEffect = new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect), false);
             createEffect.apply(game, source);
             return true;
         }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GeistOfSaintTraftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GeistOfSaintTraftTest.java
new file mode 100644
index 00000000000..2bf22a6a292
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GeistOfSaintTraftTest.java
@@ -0,0 +1,84 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.triggers;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * @author LevelX2
+ */
+public class GeistOfSaintTraftTest extends CardTestPlayerBase {
+
+    /**
+     * Geist of Saint Traft - Legendary Spirit Cleric 2/2, {1}{W}{U}
+     *
+     * Hexproof
+     * Whenever Geist of Saint Traft attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat.
+     *
+     */
+    @Test
+    public void testTokenwillBeCreated() {
+
+        addCard(Zone.BATTLEFIELD, playerB, "Geist of Saint Traft", 1);
+
+        attack(2, playerB, "Geist of Saint Traft");
+
+        setStopAt(2, PhaseStep.END_COMBAT);
+        execute();
+
+        assertPermanentCount(playerB, "Geist of Saint Traft", 1);
+        assertPowerToughness(playerB, "Geist of Saint Traft", 2, 2);
+        assertPermanentCount(playerB, "Angel", 1);
+        assertPowerToughness(playerB, "Angel", 4, 4);
+
+        assertLife(playerA, 14);
+        assertLife(playerB, 20);
+    }
+
+
+    @Test
+    public void testTokenwillBeExiled() {
+
+        addCard(Zone.BATTLEFIELD, playerB, "Geist of Saint Traft", 1);
+
+        attack(2, playerB, "Geist of Saint Traft");
+
+        setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertPermanentCount(playerB, "Geist of Saint Traft", 1);
+        assertPowerToughness(playerB, "Geist of Saint Traft", 2, 2);
+        assertPermanentCount(playerB, "Angel", 0);
+
+        assertLife(playerA, 14);
+        assertLife(playerB, 20);
+    }
+}
diff --git a/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java b/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java
index 44637c432c9..5c63067f6ae 100644
--- a/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java
@@ -49,24 +49,24 @@ public class ExileTargetEffect extends OneShotEffect {
     private String exileZone = null;
     private UUID exileId = null;
 
-    public ExileTargetEffect(UUID exileId, String exileZone, Zone onlyFromZone) {
-        super(Outcome.Exile);
-        this.exileZone = exileZone;
-        this.exileId = exileId;
-        this.onlyFromZone = onlyFromZone;
-    }
-    
-    public ExileTargetEffect(UUID exileId, String exileZone) {
-        this(exileId, exileZone, null);
-    }
-
     public ExileTargetEffect(String effectText) {
         this();
         this.staticText = effectText;
     }
 
     public ExileTargetEffect() {
-        this(null, null);
+        this(null, "");
+    }
+
+    public ExileTargetEffect(UUID exileId, String exileZone) {
+        this(exileId, exileZone, null);
+    }
+
+    public ExileTargetEffect(UUID exileId, String exileZone, Zone onlyFromZone) {
+        super(Outcome.Exile);
+        this.exileZone = exileZone;
+        this.exileId = exileId;
+        this.onlyFromZone = onlyFromZone;
     }
 
     public ExileTargetEffect(final ExileTargetEffect effect) {
diff --git a/Mage/src/mage/game/CardState.java b/Mage/src/mage/game/CardState.java
index 3311c5e5193..60bc055b338 100644
--- a/Mage/src/mage/game/CardState.java
+++ b/Mage/src/mage/game/CardState.java
@@ -2,9 +2,6 @@ package mage.game;
 
 import java.util.HashMap;
 import java.util.Map;
-import mage.abilities.Abilities;
-import mage.abilities.AbilitiesImpl;
-import mage.abilities.Ability;
 import mage.counters.Counters;
 /**
  *