diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat
index 3ed2397d3..93d46b8eb 100644
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -100,6 +100,18 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
+text={0}: Return Blinking Spirit to its owner's hand.
+id=2668
+name=Blinking Spirit
+auto={0}:moveto(ownerhand)
+rarity=R
+type=Creature
+mana={3}{W}
+power=2
+subtype=Spirit
+toughness=2
+[/card]
+[card]
 text={T}, Sacrifice a creature: Target creature gets +2/+2 until end of turn.     {1}{U}{U}, Sacrifice a creature: Counter target creature spell.
 id=2439
 auto={T}{S(creature|myBattlefield)}:2/2 target(creature)
@@ -492,6 +504,18 @@ mana={X}{G}
 type=Sorcery
 [/card]
 [card]
+text={0}: Hyalopterous Lemure gets -1/-0 and gains flying until end of turn.
+id=2457
+name=Hyalopterous Lemure
+auto={0}:-1/0 && Flying
+rarity=U
+type=Creature
+mana={4}{B}
+power=4
+subtype=Spirit
+toughness=3
+[/card]
+[card]
 text=Choose one - Counter target spell if it's red; or destroy target permanent if it's red.
 id=2508
 alias=1191
diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat
index ffe1ae2b0..322e92ef9 100644
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
@@ -227,19 +227,6 @@ mana={W}
 subtype=Aura
 [/card]
 [card]
-text={0}: Return Blinking Spirit to its owner's hand.
-id=2668
-name=Blinking Spirit
-auto={0}:moveto(ownerhand)
-#0 activation cost are not supported in WTH 0.9.1
-rarity=R
-type=Creature
-mana={3}{W}
-power=2
-subtype=Spirit
-toughness=2
-[/card]
-[card]
 text=Play Blizzard only if you control a snow land.     Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)  Creatures with flying don't untap during their controllers' untap steps.
 id=2551
 name=Blizzard
@@ -988,17 +975,6 @@ mana={1}{G}
 subtype=Aura
 [/card]
 [card]
-text={0}: Hyalopterous Lemure gets -1/-0 and gains flying until end of turn.
-id=2457
-name=Hyalopterous Lemure
-rarity=U
-type=Creature
-mana={4}{B}
-power=4
-subtype=Spirit
-toughness=3
-[/card]
-[card]
 text={X}, {T}: Put a charge counter on Ice Cauldron and remove a nonland card in your hand from the game. As long as that card remains removed from the game, you may play it. Note the type and amount of mana spent to pay this activation cost. Play this ability only if there are no charge counters on Ice Cauldron.     {T}, Remove a charge counter from Ice Cauldron: Add Ice Cauldron's last noted type and amount of mana to your mana pool. Spend this mana only to play the last card removed from the game with Ice Cauldron.
 id=2407
 name=Ice Cauldron
diff --git a/projects/mtg/bin/Res/sets/PLC/_cards.dat b/projects/mtg/bin/Res/sets/PLC/_cards.dat
index 876d6a158..cc65bd2e9 100644
--- a/projects/mtg/bin/Res/sets/PLC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PLC/_cards.dat
@@ -184,6 +184,21 @@ power=2
 toughness=2
 [/card]
 [card]
+text={0}: Until end of turn, Jodah's Avenger gets -1/-1 and gains your choice of double strike, protection from red, vigilance, or shadow. (A creature with shadow can block or be blocked by only creatures with shadow.)
+auto={0}: Double Strike && -1/-1
+auto={0}: Protection from Red && -1/-1
+auto={0}: Vigilance && -1/-1
+auto={0}: Shadow && -1/-1
+id=124482
+name=Jodah's Avenger
+mana={5}{U}
+type=Creature
+subtype=Shapeshifter
+power=4
+toughness=4
+rarity=U
+[/card]
+[card]
 text={2}, {T}: Add {B} to your mana pool for each Swamp you control.
 auto={2}{T}:foreach(swamp|myBattlefield) Add:{B}
 id=124507
diff --git a/projects/mtg/bin/Res/sets/PLC/todo.dat b/projects/mtg/bin/Res/sets/PLC/todo.dat
index ba880d422..b9afa8a47 100644
--- a/projects/mtg/bin/Res/sets/PLC/todo.dat
+++ b/projects/mtg/bin/Res/sets/PLC/todo.dat
@@ -522,17 +522,6 @@ text=Forestwalk Whenever Jedit Ojanen of Efrava attacks or blocks, put a 2/2 gre
 rarity=R
 [/card]
 [card]
-id=124482
-name=Jodah's Avenger
-mana={5}{U}
-type=Creature
-subtype=Shapeshifter
-power=4
-toughness=4
-text={0}: Until end of turn, Jodah's Avenger gets -1/-1 and gains your choice of double strike, protection from red, vigilance, or shadow. (A creature with shadow can block or be blocked by only creatures with shadow.)
-rarity=U
-[/card]
-[card]
 id=126813
 name=Kavu Predator
 mana={1}{G}
diff --git a/projects/mtg/bin/Res/sets/STH/_cards.dat b/projects/mtg/bin/Res/sets/STH/_cards.dat
index 8fc2f4226..a7ac69a80 100644
--- a/projects/mtg/bin/Res/sets/STH/_cards.dat
+++ b/projects/mtg/bin/Res/sets/STH/_cards.dat
@@ -182,6 +182,19 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Haste {0}: Flowstone Hellion gets +1/-1 until end of turn.
+auto={0}:1/-1
+abilities=Haste
+id=5153
+name=Flowstone Hellion
+mana={4}{R}
+type=Creature
+subtype=Hellion Beast
+power=3
+toughness=3
+rarity=U
+[/card]
+[card]
 text=Trample   {R}: Flowstone Mauler gets +1/-1 until end of turn.
 id=5154
 name=Flowstone Mauler
diff --git a/projects/mtg/bin/Res/sets/STH/todo.dat b/projects/mtg/bin/Res/sets/STH/todo.dat
index 23aa8efc3..3219f07b8 100644
--- a/projects/mtg/bin/Res/sets/STH/todo.dat
+++ b/projects/mtg/bin/Res/sets/STH/todo.dat
@@ -198,22 +198,6 @@ type=Instant
 text=As an additional cost to cast Fling, sacrifice a creature. Fling deals damage equal to the sacrificed creature's power to target creature or player.
 rarity=C
 [/card]
-
-[card]
-id=5153
-name=Flowstone Hellion
-mana={4}{R}
-type=Creature
-subtype=Hellion Beast
-power=3
-toughness=3
-text=Haste {0}: Flowstone Hellion gets +1/-1 until end of turn.
-rarity=U
-[/card]
-
-
-
-
 [card]
 id=5162
 name=Gliding Licid
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index b348662ef..dd6e582c9 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -907,6 +907,18 @@ rarity=R
 type=Land
 [/card]
 [card]
+text={0}: Viscid Lemures gets -1/-0 and gains swampwalk until end of turn.
+id=111082
+name=Viscid Lemures
+mana={4}{B}
+type=Creature
+subtype=Spirit
+power=4
+toughness=3
+auto={0}: -1/-0 && swampwalk
+rarity=C
+[/card]
+[card]
 text=All Sliver creatures get +0/+2.
 id=106648
 name=Watcher Sliver
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index e712dc427..9585bbb53 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -2041,18 +2041,6 @@ text={U}: Viscerid Deepwalker gets +1/+0 until end of turn. Suspend 4—{U} (Rat
 rarity=C
 [/card]
 [card]
-id=111082
-name=Viscid Lemures
-mana={4}{B}
-type=Creature
-subtype=Spirit
-power=4
-toughness=3
-text={0}: Viscid Lemures gets -1/-0 and gains swampwalk until end of turn.
-auto={0}: -1/-0 && swampwalk #{0}activation costs don't work
-rarity=C
-[/card]
-[card]
 id=111076
 name=Voidmage Husher
 mana={3}{U}
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index 05f5df321..46d492a44 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -658,6 +658,18 @@ mana={2}{U}
 type=Instant
 [/card]
 [card]
+text={0}: Hopping Automaton gets -1/-1 and gains flying until end of turn.
+id=5700
+name=Hopping Automaton
+auto={0}:-1/-1 && Flying
+rarity=U
+type=Artifact Creature
+mana={3}
+power=2
+subtype=Construct
+toughness=2
+[/card]
+[card]
 text={U}: Untap Horseshoe Crab.
 id=9849
 name=Horseshoe Crab
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index 7ffd63a4b..77cc2eaf0 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -786,17 +786,6 @@ subtype=Zombie Hound
 toughness=3
 [/card]
 [card]
-text={0}: Hopping Automaton gets -1/-1 and gains flying until end of turn.
-id=5700
-name=Hopping Automaton
-rarity=U
-type=Artifact Creature
-mana={3}
-power=2
-subtype=Construct
-toughness=2
-[/card]
-[card]
 text=Target creature loses all abilities and becomes 0/1 until end of turn.
 id=5702
 name=Humble
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index a01c6c32e..4bcfc38d8 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -73,6 +73,7 @@ beacon_of_unrest.txt
 belligerent_hatchling.txt
 benalish_knight.txt
 blessed_wine.txt
+blinking_spirit.txt
 bloodfire_colossus.txt
 bloodhall_ooze.txt
 body_double.txt
@@ -136,6 +137,7 @@ flagstones.txt
 flare.txt
 fledgling_imp.txt
 fledgling_imp2.txt
+flowstone_hellion.txt
 flowstone_slide.txt
 foratog.txt
 force_of_nature.txt
@@ -158,12 +160,14 @@ harpoon_sniper.txt
 hellfire.txt
 howl_from_beyond.txt
 howl_of_the_night_pack.txt
+hyalopterous_lemure.txt
 hymn_of_rebirth.txt
 hypnotic_specter.txt
 icatian_priest.txt
 imaginary_pet.txt
 immaculate_magistrate.txt
 instill_energy_i166.txt
+jodahs_avenger.txt
 jump.txt
 keldon_warlord.txt
 keldon_warlord2.txt
diff --git a/projects/mtg/bin/Res/test/wontfix/blinking_spirit.txt b/projects/mtg/bin/Res/test/blinking_spirit.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/wontfix/blinking_spirit.txt
rename to projects/mtg/bin/Res/test/blinking_spirit.txt
diff --git a/projects/mtg/bin/Res/test/flowstone_hellion.txt b/projects/mtg/bin/Res/test/flowstone_hellion.txt
new file mode 100644
index 000000000..08cfef743
--- /dev/null
+++ b/projects/mtg/bin/Res/test/flowstone_hellion.txt
@@ -0,0 +1,28 @@
+#NAME: Flowstone Hellion
+#DESC: {0}:Flowstone Hellion gets +1/-1 until end of turn.
+#DESC: Tests whether effect really ends at end of turn
+[INIT]
+secondmain
+[PLAYER1]
+inplay:Flowstone Hellion
+[PLAYER2]
+inplay:Mountain
+hand:Shock
+[DO]
+Flowstone Hellion
+Flowstone Hellion
+eot
+next
+next
+next
+Mountain
+Shock
+Flowstone Hellion
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:Flowstone Hellion
+[PLAYER2]
+inplay:Mountain
+graveyard:Shock
+[END]
diff --git a/projects/mtg/bin/Res/test/hyalopterous_lemure.txt b/projects/mtg/bin/Res/test/hyalopterous_lemure.txt
new file mode 100644
index 000000000..e0d58e171
--- /dev/null
+++ b/projects/mtg/bin/Res/test/hyalopterous_lemure.txt
@@ -0,0 +1,25 @@
+#NAME: Hyalopterous Lemure
+#DESC: {0}: Hyalopterous Lemure gets -1/0
+#DESC: and gains flying until end of turn.
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Air Elemental
+[PLAYER2]
+inplay:Hyalopterous Lemure
+[DO]
+Air Elemental
+next
+Hyalopterous Lemure
+choice 1
+Hyalopterous Lemure
+choice 0
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Air Elemental
+[PLAYER2]
+graveyard:Hyalopterous Lemure
+[END]
diff --git a/projects/mtg/bin/Res/test/jodahs_avenger.txt b/projects/mtg/bin/Res/test/jodahs_avenger.txt
new file mode 100644
index 000000000..1d721c76b
--- /dev/null
+++ b/projects/mtg/bin/Res/test/jodahs_avenger.txt
@@ -0,0 +1,44 @@
+#NAME: Jodah's Avenger
+#DESC: Test whether the abilities
+#DESC: can be chosen correctly
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Jodah's Avenger,Mountain
+hand:Shock
+[PLAYER2]
+inplay:Craw Wurm
+[DO]
+# Give Protection from Red
+Jodah's Avenger
+choice 1
+# Give Shadow
+Jodah's Avenger
+choice 3
+# Try to cast Shock on Jodah's Avenger
+# Shouldn't work if it gained Protection from Red
+Mountain
+Shock
+Jodah's Avenger
+# Cast Shock on Craw Wurm instead
+Craw Wurm
+next
+next
+# select attacker
+Jodah's Avenger
+choice 0
+next
+# Try to block with non-shadow creature
+# Shouldn't work if Avenger really gained Shadow
+Craw Wurm
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Jodah's Avenger,Mountain
+graveyard:Shock
+[PLAYER2]
+inplay:Craw Wurm
+life:18
+[END]