diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 70c015aef..210bbe2c2 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -35,6 +35,7 @@ generic/hybrid_mana.txt
 generic/hybrid_mana_2.txt
 generic/hybrid_mana_3.txt
 generic/indestructible.txt
+generic/indestructible_2_i570.txt
 generic/kicker.txt
 generic/kicker2.txt
 generic/lands_max_per_turn.txt
@@ -218,6 +219,9 @@ crosis_s_catacombs_1.txt
 crosis_s_catacombs_2.txt
 crumble.txt
 crystal_rod_i172.txt
+cursed_land1_i188.txt
+cursed_land3_i188.txt
+cursed_land4_i188.txt
 dark_banishing.txt
 dauntless_escort.txt
 dauthi_embrace.txt
@@ -288,6 +292,7 @@ flowstone_hellion.txt
 flowstone_slide.txt
 fog.txt
 fog_bank.txt
+fog_effect_i286.txt
 foratog.txt
 force_of_nature.txt
 force_of_nature2.txt
@@ -386,6 +391,7 @@ livingweapon.txt
 lord_of_the_pit.txt
 lord_of_the_pit2.txt
 magma_spray.txt
+manabarbs_dual_lands_i562.txt
 martial_coup.txt
 martial_coup2.txt
 master_decoy.txt
@@ -406,6 +412,7 @@ misc01.txt
 misty_rainforest_i604.txt
 moat.txt
 mobile_fort.txt
+mogg_flunkies1_i193.txt
 Morph#1.txt
 Morph#2.txt
 Morph#3.txt
@@ -436,6 +443,10 @@ paralysis.txt
 paralysis2.txt
 persuasion.txt
 phytohydra.txt
+pillory_of_the_sleepless1_i188.txt
+pillory_of_the_sleepless2_i188.txt
+pillory_of_the_sleepless3_i188.txt
+pillory_of_the_sleepless4_i188.txt
 plague_rats.txt
 plumes_of_peace_i260.txt
 pouncing_jaguar_i425.txt
@@ -452,6 +463,10 @@ quilled_sliver.txt
 rain_of_filth_i206.txt
 rain_of_filth_i283.txt
 rainbow_efreet_phase_out.txt
+rakdos_pit_dragon_i555_1.txt
+rakdos_pit_dragon_i555_2.txt
+rakdos_pit_dragon_i555_3.txt
+rakdos_pit_dragon_i555_4.txt
 rampant_growth.txt
 rancid_earth_with_threshold.txt
 rancid_earth_without_threshold.txt
@@ -517,6 +532,7 @@ soul's_grace_POWERLIFEGAIN.txt
 spark_elemental.txt
 sphinx_summoner.txt
 spirit_link.txt
+spirit_link_i173.txt
 SPIRITLINK_keyword#1.txt
 SPIRITLINK_keyword#2.txt
 SPIRITLINK_keyword#3.txt
@@ -532,6 +548,7 @@ stonebrow2.txt
 stonebrow_i159.txt
 stronghold_discipline.txt
 sword_to_plowshares.txt
+sylvan_basilisk_i182.txt
 sylvan_scrying_i195.txt
 symbiotic_wurm.txt
 tangle_golem.txt
diff --git a/projects/mtg/bin/Res/test/bugs/_tests_for_i188.txt b/projects/mtg/bin/Res/test/bugs/_tests_for_i188.txt
deleted file mode 100644
index f8558a5f4..000000000
--- a/projects/mtg/bin/Res/test/bugs/_tests_for_i188.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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/bloodhall_ooze_i148.txt b/projects/mtg/bin/Res/test/bugs/bloodhall_ooze_i148.txt
deleted file mode 100644
index 010545ce2..000000000
--- a/projects/mtg/bin/Res/test/bugs/bloodhall_ooze_i148.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-#NAME: Bloodhall Ooze i148
-#DESC: When a black or green creature is
-#DESC: summoned, then the first "Bloodhall
-#DESC: Ooze" in the summoning player's
-#DESC: battlefield should not get a
-#DESC: +1/+1 counter. The Bloodhall Ooze
-#DESC: should only get counters during
-#DESC: the Upkeep phase.
-[INIT]
-untap
-[PLAYER1]
-inplay:swamp,bloodhall ooze,bloodhall ooze
-library:muck rats
-[PLAYER2]
-life:20
-[DO]
-next
-next
-next
-swamp
-muck rats
-ai
-next
-[ASSERT]
-untap
-[PLAYER1]
-inplay:swamp,bloodhall ooze,bloodhall ooze,muck rats
-[PLAYER2]
-life:18
-[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
deleted file mode 100644
index 8c8e65e7e..000000000
--- a/projects/mtg/bin/Res/test/bugs/cursed_land2_i188.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-#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/lorescale_coatl_repulsed_i189.txt b/projects/mtg/bin/Res/test/bugs/lorescale_coatl_repulsed_i189.txt
deleted file mode 100644
index fe44edd0f..000000000
--- a/projects/mtg/bin/Res/test/bugs/lorescale_coatl_repulsed_i189.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#NAME: Lorescale Coatl repulsed
-#DESC: A bug report claimed that the PSP crashed
-#DESC: after casting Repulse on one's own
-#DESC: Lorescale Coatl. The Coatl was sent to its
-#DESC: owner's hand, but its pump ability still
-#DESC: triggered.
-#DESC: The script just prepares the cards and waits
-#DESC: for you to cast Repulse on the Coatl. On
-#DESC: Windows I managed to reproduce the odd
-#DESC: behavior (the Coatl's ability triggering
-#DESC: after it has been repulsed), but not the
-#DESC: crash. Nevertheless it looks fishy, so I'm
-#DESC: committing the script for other people to
-#DESC: test on PSPs.
-#DESC: See: http://code.google.com/p/wagic/issues/detail?id=189
-[INIT]
-firstmain
-[PLAYER1]
-inplay:Lorescale Coatl
-hand:Repulse
-library:Island
-manapool:{U}{U}{U}
-[PLAYER2]
-[DO]
-human
-[ASSERT]
-firstmain
-[PLAYER1]
-hand:Lorescale Coatl,Island
-graveyard:Repulse
-[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
deleted file mode 100644
index 6640eae9f..000000000
--- a/projects/mtg/bin/Res/test/bugs/mogg_flunkies2_i193.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-#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/cursed_land1_i188.txt b/projects/mtg/bin/Res/test/cursed_land1_i188.txt
similarity index 93%
rename from projects/mtg/bin/Res/test/bugs/cursed_land1_i188.txt
rename to projects/mtg/bin/Res/test/cursed_land1_i188.txt
index 1f9c1478a..acddfac35 100644
--- a/projects/mtg/bin/Res/test/bugs/cursed_land1_i188.txt
+++ b/projects/mtg/bin/Res/test/cursed_land1_i188.txt
@@ -14,7 +14,6 @@ inplay:Plains
 Cursed Land
 Plains
 eot
-eot
 next
 [ASSERT]
 upkeep
diff --git a/projects/mtg/bin/Res/test/bugs/cursed_land3_i188.txt b/projects/mtg/bin/Res/test/cursed_land3_i188.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/cursed_land3_i188.txt
rename to projects/mtg/bin/Res/test/cursed_land3_i188.txt
diff --git a/projects/mtg/bin/Res/test/bugs/cursed_land4_i188.txt b/projects/mtg/bin/Res/test/cursed_land4_i188.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/cursed_land4_i188.txt
rename to projects/mtg/bin/Res/test/cursed_land4_i188.txt
diff --git a/projects/mtg/bin/Res/test/bugs/fog_effect_i286.txt b/projects/mtg/bin/Res/test/fog_effect_i286.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/fog_effect_i286.txt
rename to projects/mtg/bin/Res/test/fog_effect_i286.txt
diff --git a/projects/mtg/bin/Res/test/bugs/indestructible_2_i570.txt b/projects/mtg/bin/Res/test/generic/indestructible_2_i570.txt
similarity index 92%
rename from projects/mtg/bin/Res/test/bugs/indestructible_2_i570.txt
rename to projects/mtg/bin/Res/test/generic/indestructible_2_i570.txt
index d17e01211..d205e660c 100644
--- a/projects/mtg/bin/Res/test/bugs/indestructible_2_i570.txt
+++ b/projects/mtg/bin/Res/test/generic/indestructible_2_i570.txt
@@ -10,6 +10,7 @@ manapool:{1}{B}
 inplay:Runeclaw Bear
 [DO]
 Blister Beetle
+choice 0
 Darksteel Myr
 [ASSERT]
 FIRSTMAIN
diff --git a/projects/mtg/bin/Res/test/bugs/manabarbs_dual_lands_i562.txt b/projects/mtg/bin/Res/test/manabarbs_dual_lands_i562.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/manabarbs_dual_lands_i562.txt
rename to projects/mtg/bin/Res/test/manabarbs_dual_lands_i562.txt
diff --git a/projects/mtg/bin/Res/test/bugs/mogg_flunkies1_i193.txt b/projects/mtg/bin/Res/test/mogg_flunkies1_i193.txt
similarity index 88%
rename from projects/mtg/bin/Res/test/bugs/mogg_flunkies1_i193.txt
rename to projects/mtg/bin/Res/test/mogg_flunkies1_i193.txt
index d11a4951d..9ff64de3e 100644
--- a/projects/mtg/bin/Res/test/bugs/mogg_flunkies1_i193.txt
+++ b/projects/mtg/bin/Res/test/mogg_flunkies1_i193.txt
@@ -15,10 +15,9 @@ Grizzly Bears
 Mogg Flunkies
 Grizzly Bears
 next
-next
-next
+#combat blockers
 [ASSERT]
-combatend
+combatblockers
 [PLAYER1]
 inplay:Mogg Flunkies,Grizzly Bears
 [PLAYER2]
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless1_i188.txt b/projects/mtg/bin/Res/test/pillory_of_the_sleepless1_i188.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless1_i188.txt
rename to projects/mtg/bin/Res/test/pillory_of_the_sleepless1_i188.txt
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless2_i188.txt b/projects/mtg/bin/Res/test/pillory_of_the_sleepless2_i188.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless2_i188.txt
rename to projects/mtg/bin/Res/test/pillory_of_the_sleepless2_i188.txt
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless3_i188.txt b/projects/mtg/bin/Res/test/pillory_of_the_sleepless3_i188.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless3_i188.txt
rename to projects/mtg/bin/Res/test/pillory_of_the_sleepless3_i188.txt
diff --git a/projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless4_i188.txt b/projects/mtg/bin/Res/test/pillory_of_the_sleepless4_i188.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/pillory_of_the_sleepless4_i188.txt
rename to projects/mtg/bin/Res/test/pillory_of_the_sleepless4_i188.txt
diff --git a/projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_1.txt b/projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_1.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_1.txt
rename to projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_1.txt
diff --git a/projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_2.txt b/projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_2.txt
similarity index 87%
rename from projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_2.txt
rename to projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_2.txt
index f8256a32c..0c4ddb134 100644
--- a/projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_2.txt
+++ b/projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_2.txt
@@ -14,7 +14,9 @@ rakdos pit dragon
 next
 #blockers
 next
-#damage
+#damage first strike
+next
+#second strike
 next
 #combatend
 [ASSERT]
diff --git a/projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_3.txt b/projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_3.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_3.txt
rename to projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_3.txt
diff --git a/projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_4.txt b/projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_4.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/rakdos_pit_dragon_i555_4.txt
rename to projects/mtg/bin/Res/test/rakdos_pit_dragon_i555_4.txt
diff --git a/projects/mtg/bin/Res/test/bugs/spirit_link_i173.txt b/projects/mtg/bin/Res/test/spirit_link_i173.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/spirit_link_i173.txt
rename to projects/mtg/bin/Res/test/spirit_link_i173.txt
diff --git a/projects/mtg/bin/Res/test/bugs/sylvan_basilisk_i182.txt b/projects/mtg/bin/Res/test/sylvan_basilisk_i182.txt
similarity index 82%
rename from projects/mtg/bin/Res/test/bugs/sylvan_basilisk_i182.txt
rename to projects/mtg/bin/Res/test/sylvan_basilisk_i182.txt
index abfeab8c3..826fe85ed 100644
--- a/projects/mtg/bin/Res/test/bugs/sylvan_basilisk_i182.txt
+++ b/projects/mtg/bin/Res/test/sylvan_basilisk_i182.txt
@@ -28,18 +28,28 @@ Giant Spider
 next
 Sylvan Basilisk
 eot
+#untap
 next
+#upkeep
 next
+#draw
 next
+#main
 next
+#begins
 next
+#attackers
 Sylvan Basilisk
 next
+#blockers
 Gosta Dirk
 next
+#first strike damage, Gosta Dirk gets destroyed
+#Weirdness happens here, we get directly to combat end
 next
+#main 2
 [ASSERT]
-combatend
+secondmain
 [PLAYER1]
 inplay:Giant Spider
 graveyard:Gosta Dirk