diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index 249a85d04..9d2e70fb3 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -1572,17 +1572,6 @@ mana={0}
 type=Artifact
 [/card]
 [card]
-text=Equipped creature gets +2/+2.     Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
-id=83447
-name=Vulshok Morningstar
-rarity=C
-type=Artifact
-mana={2}
-auto={2}:equip
-auto=2/2
-subtype=Equipment
-[/card]
-[card]
 text=Fear Whenever Woebearer deals combat damage to a player, you may return target creature card from your graveyard to your hand.
 id=46074
 name=Woebearer
diff --git a/projects/mtg/bin/Res/sets/ZEN/_cards.dat b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
index 04d935b60..92e4e3081 100644
--- a/projects/mtg/bin/Res/sets/ZEN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
@@ -1529,6 +1529,19 @@ type=Instant
 rarity=C
 [/card]
 [card]
+id=191368
+name=Warren Instigator
+mana={R}{R}
+type=Creature
+subtype=Goblin Berserker
+power=1
+toughness=1
+text=Double strike -- Whenever Warren Instigator deals damage to an opponent, you may put a Goblin creature card from your hand onto the battlefield.
+auto=@damaged(player) from(this):may moveto(myBattlefield) target(creature[goblin]|myHand)
+abilities=double strike
+rarity=M
+[/card]
+[card]
 text=Flying   Welkin Tern can block only creatures with flying.
 id=191353
 name=Welkin Tern
diff --git a/projects/mtg/bin/Res/sets/ZEN/todo.dat b/projects/mtg/bin/Res/sets/ZEN/todo.dat
index 8c8efa847..49b2eb0a2 100644
--- a/projects/mtg/bin/Res/sets/ZEN/todo.dat
+++ b/projects/mtg/bin/Res/sets/ZEN/todo.dat
@@ -844,19 +844,6 @@ text=Kicker {3}{R} (You may pay an additional {3}{R} as you cast this spell.) Da
 rarity=U
 [/card]
 [card]
-id=191368
-name=Warren Instigator
-mana={R}{R}
-type=Creature
-subtype=Goblin Berserker
-power=1
-toughness=1
-text=Double strike Whenever Warren Instigator deals damage to an opponent, you may put a Goblin creature card from your hand onto the battlefield.
-#The double strike abilities triggers 2 damage event, so the following allow you to put 2 cards each time it damaged an oppponent.
-auto=@damaged(player) from(this):may moveto(myBattlefield) target(goblin|myHand)
-rarity=M
-[/card]
-[card]
 id=183403
 name=Zektar Shrine Expedition
 mana={1}{R}
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 73a6a31e7..11441a966 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -9,6 +9,9 @@ generic/doesnotuntap2.txt
 generic/double_strike.txt
 generic/equip_landfall_buff.txt
 generic/equip_reach.txt
+generic/equip_shroud.txt
+generic/equip_shroud2.txt
+generic/equip_wither.txt
 generic/fear.txt
 generic/fear_i147.txt
 generic/first_and_double_strike1_i187.txt
@@ -65,7 +68,6 @@ angry_mob3.txt
 angry_mob4.txt
 angry_mob4b.txt
 angry_mob5.txt
-angry_mob6.txt
 angry_mob7.txt
 animate_artifact.txt
 animate_artifact2.txt
@@ -188,6 +190,7 @@ fledgling_imp2.txt
 flowstone_hellion.txt
 flowstone_slide.txt
 fog.txt
+fog_bank.txt
 foratog.txt
 force_of_nature.txt
 force_of_nature2.txt
@@ -347,6 +350,7 @@ volcanic_eruption.txt
 walking_wall.txt
 wall_of_diffusion.txt
 wall_of_diffusion2.txt
+warren_instigator.txt
 welkin_hawk.txt
 whispersilk_cloak.txt
 whispersilk_cloak2.txt
diff --git a/projects/mtg/bin/Res/test/angry_mob6.txt b/projects/mtg/bin/Res/test/bugs/angry_mob6_i240.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/angry_mob6.txt
rename to projects/mtg/bin/Res/test/bugs/angry_mob6_i240.txt
diff --git a/projects/mtg/bin/Res/test/fog_bank.txt b/projects/mtg/bin/Res/test/fog_bank.txt
new file mode 100644
index 000000000..1da3409f5
--- /dev/null
+++ b/projects/mtg/bin/Res/test/fog_bank.txt
@@ -0,0 +1,22 @@
+#NAME: Fog Bank
+#DESC: Verifies that Fog Bank takes
+#DESC: no damage when blocking
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Grizzly Bears
+[PLAYER2]
+inplay:Fog Bank
+[DO]
+Grizzly Bears
+next
+Fog Bank
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Grizzly Bears
+[PLAYER2]
+inplay:Fog Bank
+[END]
diff --git a/projects/mtg/bin/Res/test/warren_instigator.txt b/projects/mtg/bin/Res/test/warren_instigator.txt
new file mode 100644
index 000000000..1ebbb8546
--- /dev/null
+++ b/projects/mtg/bin/Res/test/warren_instigator.txt
@@ -0,0 +1,27 @@
+#NAME: Warren Instigator
+#DESC: verifies that Warren Instigator's
+#DESC: ability correctly can be used
+#DESC: twice due to double strike
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Warren Instigator
+hand:Raging Goblin,Goblin King
+[PLAYER2]
+[DO]
+Warren Instigator
+next
+next
+choice 0
+Raging Goblin
+next
+choice 0
+Goblin King
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Warren Instigator,Raging Goblin,Goblin King
+[PLAYER2]
+life:18
+[END]