diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Geistblast.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Geistblast.java
index b0143dd9efd..bcb16493290 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Geistblast.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Geistblast.java
@@ -69,7 +69,7 @@ public class Geistblast extends CardImpl {
         this.getSpellAbility().addEffect(new DamageTargetEffect(2));
         this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
 
-        // {2}{U}, Exile Geist from your graveyard: Copy target instant or sorcery you control. You may choose new targets for the copy.
+        // {2}{U}, Exile Geistblast from your graveyard: Copy target instant or sorcery you control. You may choose new targets for the copy.
         Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new CopyTargetSpellEffect(), new ManaCostsImpl<>("{2}{U}"));
         ability.addTarget(new TargetSpell(filter));
         ability.addCost(new ExileSourceFromGraveCost());
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java
index 588f0b98bc6..f3f5e7f7643 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SoulWardenTest.java
@@ -27,14 +27,17 @@ public class SoulWardenTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Soul Warden", 1);
 
         // Creature 2/1
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard");
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raise the Alarm");
-        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Soul Warden");
-        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Elite Vanguard");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); // 2/1 creature
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raise the Alarm"); // put 2 1/1 soldiers on the battlefield
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt");
+        addTarget(playerA, "Soul Warden");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Elite Vanguard"); // should not gain life now that soul warden is dead
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
 
+        assertGraveyardCount(playerA, "Lightning Bolt", 1);
+        assertGraveyardCount(playerA, "Soul Warden", 1);
         assertLife(playerA, 23);
         assertLife(playerB, 20);
     }