diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index c544497c8..f356ccedf 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -76,10 +76,10 @@ blessed_wine.txt
 bloodfire_colossus.txt
 bloodhall_ooze.txt
 body_double.txt
+boggart_arsonists.txt
 borderland_behemoth.txt
 bottle_gnomes.txt
 bottle_gnomes2.txt
-boggart_arsonists.txt
 brass_man.txt
 cage_of_hands.txt
 Call_to_Heel_1.txt
@@ -104,8 +104,8 @@ counterspell.txt
 counterspell2.txt
 counterspell3.txt
 counterspell4.txt
-crimson_kobolds.txt
 creature_bond.txt
+crimson_kobolds.txt
 dauntless_escort.txt
 dauthi_embrace.txt
 death_ward.txt
@@ -126,13 +126,13 @@ elvish_promenade.txt
 emblem_of_the_warmind.txt
 enervate.txt
 erg_raiders_i157.txt
-farmstead.txt
-flagstones.txt
 farhaven_elf.txt
+farmstead.txt
 fastbond.txt
 fastbond2.txt
 fault_line.txt
 fists_of_ironwood.txt
+flagstones.txt
 flare.txt
 fledgling_imp.txt
 fledgling_imp2.txt
@@ -234,26 +234,26 @@ seedcradle_witch.txt
 seismic_assault.txt
 seismic_spike_i191.txt
 selesnya_guildmage.txt
-siege_gang_commander.txt
 shepherd_of_rot.txt
 shivan_hellkite.txt
 shock.txt
 shock2.txt
+siege_gang_commander.txt
 slate_of_ancestry.txt
 sleeper_agent.txt
 slith_bloodletter.txt
 soulblast.txt
-sphinx_summoner.txt
-spitting_earth.txt
 spark_elemental.txt
+sphinx_summoner.txt
 spirit_link.txt
+spitting_earth.txt
 spoils_of_evil.txt
 stasis.txt
 steelclad_serpent1.txt
 steelclad_serpent2.txt
 stillmoon_cavalier.txt
-stonebrow_i159.txt
 stonebrow2.txt
+stonebrow_i159.txt
 stronghold_discipline.txt
 sword_to_plowshares.txt
 symbiotic_wurm.txt
@@ -266,10 +266,9 @@ titanic_ultimatum.txt
 torture.txt
 tranquil_domain.txt
 twitch.txt
-unstable_mutation2.txt
-unwilling_recruit.txt
 unstable_mutation.txt
 unstable_mutation2.txt
+unwilling_recruit.txt
 vampire_bats.txt
 vampiric_link.txt
 volcanic_eruption.txt
diff --git a/projects/mtg/bin/Res/test/ebony_horse.txt b/projects/mtg/bin/Res/test/ebony_horse.txt
index 34165c9f0..12eb8e5e0 100644
--- a/projects/mtg/bin/Res/test/ebony_horse.txt
+++ b/projects/mtg/bin/Res/test/ebony_horse.txt
@@ -16,7 +16,7 @@ mountain
 swamp
 ebony horse
 grizzly bears
-endofinterruption
+endinterruption
 next
 [ASSERT]
 COMBATEND
diff --git a/projects/mtg/bin/Res/test/order_blockers.txt b/projects/mtg/bin/Res/test/manual/order_blockers.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/order_blockers.txt
rename to projects/mtg/bin/Res/test/manual/order_blockers.txt
diff --git a/projects/mtg/bin/Res/test/angel_of_despair.txt b/projects/mtg/bin/Res/test/wontfix/angel_of_despair.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/angel_of_despair.txt
rename to projects/mtg/bin/Res/test/wontfix/angel_of_despair.txt
diff --git a/projects/mtg/bin/Res/test/looming_hoverguard.txt b/projects/mtg/bin/Res/test/wontfix/looming_hoverguard.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/looming_hoverguard.txt
rename to projects/mtg/bin/Res/test/wontfix/looming_hoverguard.txt
diff --git a/projects/mtg/bin/Res/test/ogre_gatecrasher.txt b/projects/mtg/bin/Res/test/wontfix/ogre_gatecrasher.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/ogre_gatecrasher.txt
rename to projects/mtg/bin/Res/test/wontfix/ogre_gatecrasher.txt
diff --git a/projects/mtg/bin/Res/test/viridian_shaman.txt b/projects/mtg/bin/Res/test/wontfix/viridian_shaman.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/viridian_shaman.txt
rename to projects/mtg/bin/Res/test/wontfix/viridian_shaman.txt