diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index 532164044..caa4c094a 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -551,17 +551,6 @@ toughness=2
 abilities=shadow
 [/card]
 [card]
-text=As an additional cost to play Sonic Burst, discard a card at random. Sonic Burst deals 4 damage to target creature or player.
-id=6112
-name=Sonic Burst
-target=creature,player
-auto=damage:4
-auto=discard:1 controller
-rarity=C
-mana={1}{R}
-type=Instant
-[/card]
-[card]
 text=Whenever another creature enters the battlefield, you gain 1 life.
 id=6033
 name=Soul Warden
diff --git a/projects/mtg/bin/Res/sets/EXO/todo.dat b/projects/mtg/bin/Res/sets/EXO/todo.dat
index 4163c2239..b021f042a 100644
--- a/projects/mtg/bin/Res/sets/EXO/todo.dat
+++ b/projects/mtg/bin/Res/sets/EXO/todo.dat
@@ -612,6 +612,18 @@ auto=lord(creature[enchanted]) cantblock
 rarity=U
 [/card]
 [card]
+#Removed: can be played from an empty hand without discarding a card
+text=As an additional cost to play Sonic Burst, discard a card at random. Sonic Burst deals 4 damage to target creature or player.
+id=6112
+name=Sonic Burst
+target=creature,player
+auto=damage:4
+auto=discard:1 controller
+rarity=C
+mana={1}{R}
+type=Instant
+[/card]
+[card]
 id=6158
 name=Spellbook
 mana={0}
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index be3ace93c..d37bce5fb 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -13,17 +13,6 @@ type=Land
 rarity=C
 [/card]
 [card]
-text=As an additional cost to cast Acceptable Losses, discard a card at random.   Acceptable Losses deals 5 damage to target creature.
-id=30692
-target=creature
-auto=damage:5
-auto=discard:1 controller
-name=Acceptable Losses
-rarity=C
-mana={3}{R}
-type=Sorcery
-[/card]
-[card]
 text=Target creature gets -1/-1 until end of turn.   Draw a card. 
 id=29740
 name=Afflict
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index 4974ee803..174cb2c37 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -19,6 +19,18 @@ mana={U}
 subtype=Aura
 [/card]
 [card]
+#Removed: can be played from an empty hand without discarding a card
+text=As an additional cost to cast Acceptable Losses, discard a card at random.   Acceptable Losses deals 5 damage to target creature.
+id=30692
+target=creature
+auto=damage:5
+auto=discard:1 controller
+name=Acceptable Losses
+rarity=C
+mana={3}{R}
+type=Sorcery
+[/card]
+[card]
 text={1}: The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
 id=29922
 name=Aegis of Honor
diff --git a/projects/mtg/bin/Res/test/bugs/_tests_for_i188.txt b/projects/mtg/bin/Res/test/bugs/_tests_for_i188.txt
new file mode 100644
index 000000000..f8558a5f4
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/_tests_for_i188.txt
@@ -0,0 +1,8 @@
+bugs/cursed_land1_i188.txt
+bugs/cursed_land2_i188.txt
+bugs/cursed_land3_i188.txt
+bugs/cursed_land4_i188.txt
+bugs/pillory_of_the_sleepless1_i188.txt
+bugs/pillory_of_the_sleepless2_i188.txt
+bugs/pillory_of_the_sleepless3_i188.txt
+bugs/pillory_of_the_sleepless4_i188.txt
diff --git a/projects/mtg/bin/Res/test/bugs/control_change_untap_i192.txt b/projects/mtg/bin/Res/test/bugs/control_change_untap_i192.txt
new file mode 100644
index 000000000..b6b9a29b0
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/control_change_untap_i192.txt
@@ -0,0 +1,26 @@
+#NAME: Control change untap
+#DESC: Bug: After taking control of a tapped
+#DESC: enemy creature, the creature is displayed
+#DESC: as untapped (although the game correctly
+#DESC: treats it as tapped otherwise).
+#DESC: The script taps an enemy creature and
+#DESC: gives you control over it. It's displayed
+#DESC: as untapped - but it shoes up as a valid
+#DESC: target for Assassinate, so it must actually
+#DESC: be tapped. Dont cast Assasinate, instead
+#DESC: cast Twitch and untap the creature. The
+#DESC: display doesn't change, but Assassinate
+#DESC: cannot target it any more. Conclusion: The
+#DESC: game state is correct, but the display not.
+firstmain
+[PLAYER1]
+hand:Control Magic,Enervate,Assassinate,Twitch
+manapool:{U}{U}{U}{U}{U}{U}{U}{U}{U}{U}{B}{B}{B}
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+Enervate
+Grizzly Bears
+Control Magic
+Grizzly Bears
+human
diff --git a/projects/mtg/bin/Res/test/bugs/cursed_land1_i188.txt b/projects/mtg/bin/Res/test/bugs/cursed_land1_i188.txt
new file mode 100644
index 000000000..1f9c1478a
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/cursed_land1_i188.txt
@@ -0,0 +1,26 @@
+#NAME: Cursed Land 1
+#DESC: Tests whether Cursed Land triggers correctly.
+#DESC: First part: Cast on an opponent's land.
+#DESC: Verifies that Cursed Land does
+#DESC: damage to correct player.
+[INIT]
+secondmain
+[PLAYER1]
+hand:Cursed Land
+manapool:{B}{B}{B}{B}
+[PLAYER2]
+inplay:Plains
+[DO]
+Cursed Land
+Plains
+eot
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Cursed Land
+[PLAYER2]
+inplay:Plains
+life:19
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/cursed_land2_i188.txt b/projects/mtg/bin/Res/test/bugs/cursed_land2_i188.txt
new file mode 100644
index 000000000..8c8e65e7e
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/cursed_land2_i188.txt
@@ -0,0 +1,24 @@
+#NAME: Cursed Land 2
+#DESC: Tests whether Cursed Land triggers correctly.
+#DESC: Second Part: Cast on an opponent's land.
+#DESC: Verifies that Cursed Land
+#DESC: does *not* trigger in opponent's turn.
+[INIT]
+secondmain
+[PLAYER1]
+hand:Cursed Land
+manapool:{B}{B}{B}{B}
+[PLAYER2]
+inplay:Plains
+[DO]
+Cursed Land
+Plains
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Cursed Land
+[PLAYER2]
+inplay:Plains
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/cursed_land3_i188.txt b/projects/mtg/bin/Res/test/bugs/cursed_land3_i188.txt
new file mode 100644
index 000000000..141a38bd2
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/cursed_land3_i188.txt
@@ -0,0 +1,24 @@
+#NAME: Cursed Land 3
+#DESC: Tests whether Cursed Land triggers correctly.
+#DESC: Third part: Cast on one's own land. Verifies
+#DESC: that Cursed Land does damage to correct player.
+[INIT]
+secondmain
+[PLAYER1]
+inplay:Plains
+hand:Cursed Land
+manapool:{B}{B}{B}{B}
+[PLAYER2]
+[DO]
+Cursed Land
+Plains
+eot
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Cursed Land,Plains
+life:19
+[PLAYER2]
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/cursed_land4_i188.txt b/projects/mtg/bin/Res/test/bugs/cursed_land4_i188.txt
new file mode 100644
index 000000000..96aae1a1a
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/cursed_land4_i188.txt
@@ -0,0 +1,23 @@
+#NAME: Cursed Land 4
+#DESC: Tests whether Cursed Land triggers correctly.
+#DESC: Fourth Part: Cast on one's own land.
+#DESC: Verifies that Cursed Land does *not* trigger
+#DESC: in opponent's turn.
+[INIT]
+secondmain
+[PLAYER1]
+inplay:Plains
+hand:Cursed Land
+manapool:{B}{B}{B}{B}
+[PLAYER2]
+[DO]
+Cursed Land
+Plains
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Cursed Land,Plains
+[PLAYER2]
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/mogg_flunkies1_i193.txt b/projects/mtg/bin/Res/test/bugs/mogg_flunkies1_i193.txt
new file mode 100644
index 000000000..d11a4951d
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/mogg_flunkies1_i193.txt
@@ -0,0 +1,25 @@
+#NAME: Mogg Flunkies
+#DESC: If you choose the Grizzly Bears as
+#DESC: attackers, then choose one Mogg
+#DESC: Flunkies as attacker, and then remove
+#DESC: the Grizzly Bears as attackers, then
+#DESC: the Mogg Flunkies shouldn't be able
+#DESC: to attack
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Mogg Flunkies,Grizzly Bears
+[PLAYER2]
+[DO]
+Grizzly Bears
+Mogg Flunkies
+Grizzly Bears
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Mogg Flunkies,Grizzly Bears
+[PLAYER2]
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/mogg_flunkies2_i193.txt b/projects/mtg/bin/Res/test/bugs/mogg_flunkies2_i193.txt
new file mode 100644
index 000000000..6640eae9f
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/mogg_flunkies2_i193.txt
@@ -0,0 +1,19 @@
+#NAME: Mogg Flunkies
+#DESC: Testbed for two situations:
+#DESC: 1. If you choose the Grizzly Bears as
+#DESC:    attackers, then choose one Mogg
+#DESC:    Flunkies as attacker, and then remove
+#DESC:    the Grizzly Bears as attackers, then
+#DESC:    the Mogg Flunkies shouldn't be able
+#DESC:    to attack
+#DESC: 2. Choosing two Mogg Flunkies as attackers
+#DESC:    should work, but how can one do that
+#DESC:    without selecting the Grizzly Bears
+#DESC:    first?
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Mogg Flunkies,Mogg Flunkies,Grizzly Bears
+[PLAYER2]
+[DO]
+human
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless1_i188.txt b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless1_i188.txt
new file mode 100644
index 000000000..95ae541e9
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless1_i188.txt
@@ -0,0 +1,27 @@
+#NAME: Pillory of the Sleepless
+#DESC: Tests whether Pillory of the
+#DESC: Sleepless triggers correctly.
+#DESC: First Part: cast on an opponent's creature.
+#DESC: Verifies that Pillory of the Sleepless
+#DESC: does damage to correct player.
+[INIT]
+secondmain
+[PLAYER1]
+hand:Pillory of the Sleepless
+manapool:{B}{B}{W}
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+Pillory of the Sleepless
+Grizzly Bears
+eot
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Pillory of the Sleepless
+[PLAYER2]
+inplay:Grizzly Bears
+life:19
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless2_i188.txt b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless2_i188.txt
new file mode 100644
index 000000000..500ba40e4
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless2_i188.txt
@@ -0,0 +1,26 @@
+#NAME: Pillory of the Sleepless 2
+#DESC: Tests whether Pillory of the
+#DESC: Sleepless triggers correctly.
+#DESC: Second Part: cast on an opponent's creature.
+#DESC: Verifies that Pillory of the Sleepless
+#DESC: does trigger in opponent's turn.
+[INIT]
+secondmain
+[PLAYER1]
+hand:Pillory of the Sleepless
+manapool:{B}{B}{W}
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+Pillory of the Sleepless
+Grizzly Bears
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Pillory of the Sleepless
+[PLAYER2]
+inplay:Grizzly Bears
+life:19
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless3_i188.txt b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless3_i188.txt
new file mode 100644
index 000000000..84b6b2485
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless3_i188.txt
@@ -0,0 +1,26 @@
+#NAME: Pillory of the Sleepless 3
+#DESC: Tests whether Pillory of the
+#DESC: Sleepless triggers correctly.
+#DESC: Third part: cast on one's own creature.
+#DESC: Verifies that Pillory of the Sleepless
+#DESC: does damage to correct player.
+[INIT]
+secondmain
+[PLAYER1]
+inplay:Grizzly Bears
+hand:Pillory of the Sleepless
+manapool:{B}{B}{W}
+[PLAYER2]
+[DO]
+Pillory of the Sleepless
+Grizzly Bears
+eot
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Pillory of the Sleepless,Grizzly Bears
+life:19
+[PLAYER2]
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless4_i188.txt b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless4_i188.txt
new file mode 100644
index 000000000..dbd217d0f
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless4_i188.txt
@@ -0,0 +1,24 @@
+#NAME: Pillory of the Sleepless 4
+#DESC: Tests whether Pillory of the
+#DESC: Sleepless triggers correctly.
+#DESC: Fourth part: cast on one's own creature.
+#DESC: Verifies that Pillory of the Sleepless
+#DESC: does *not* trigger in opponent's turn.
+[INIT]
+secondmain
+[PLAYER1]
+inplay:Grizzly Bears
+hand:Pillory of the Sleepless
+manapool:{B}{B}{W}
+[PLAYER2]
+[DO]
+Pillory of the Sleepless
+Grizzly Bears
+eot
+next
+[ASSERT]
+upkeep
+[PLAYER1]
+inplay:Pillory of the Sleepless,Grizzly Bears
+[PLAYER2]
+[END]