diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index d6a126332..56e57fd12 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -6,6 +6,7 @@ generic/deathtouch.txt
 generic/doesnotuntap.txt
 generic/doesnotuntap2.txt
 generic/fear.txt
+generic/fear_i147.txt
 generic/first_strike.txt
 generic/first_strike2.txt
 generic/first_strike3.txt
@@ -101,6 +102,7 @@ counterspell3.txt
 counterspell4.txt
 crimson_kobolds.txt
 creature_bond.txt
+dauntless_escort.txt
 dauthi_embrace.txt
 death_ward.txt
 deja_vu.txt
@@ -156,6 +158,7 @@ jump.txt
 keldon_warlord.txt
 keldon_warlord2.txt
 kird_ape.txt
+kjeldoran_frostbeast1.txt
 kraken_eye.txt
 kraken_eye2.txt
 kraken_eye3.txt
diff --git a/projects/mtg/bin/Res/test/bugs/disrupting_scepter_i163.txt b/projects/mtg/bin/Res/test/bugs/disrupting_scepter_i163.txt
new file mode 100644
index 000000000..876ae7ccd
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/disrupting_scepter_i163.txt
@@ -0,0 +1,27 @@
+#NAME: Disrupting Scepter
+#DESC: When Disrupting Scepter is activated,
+#DESC: it does not allow to choose a target.
+#DESC: Instead, a red rectangle flashes briefly
+#DESC: around the whole screen. No mana is used.
+#DESC: See: http://code.google.com/p/wagic/issues/detail?id=163
+[INIT]
+firstmain
+[PLAYER1]
+hand:Disrupting Scepter
+manapool:{6}
+[PLAYER2]
+hand:Forest,Forest
+[DO]
+Disrupting Scepter
+Disrupting Scepter
+p2
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:Disrupting Scepter
+hand:
+manapool:
+[PLAYER2]
+hand:Forest
+graveyard:Forest
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/drain_life_nonblack_i164.txt b/projects/mtg/bin/Res/test/bugs/drain_life_nonblack_i164.txt
new file mode 100644
index 000000000..1bdc9f933
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/drain_life_nonblack_i164.txt
@@ -0,0 +1,23 @@
+#NAME: Drain Life and non-black mana
+#DESC: Drain Life can use non-black mana
+#DESC: for its effect.
+#DESC: See: http://code.google.com/p/wagic/issues/detail?id=164
+[INIT]
+firstmain
+[PLAYER1]
+hand:Drain Life
+manapool:{B}{B}{B}{W}{U}{U}{3}
+[PLAYER2]
+[DO]
+Drain Life
+p2
+[ASSERT]
+firstmain
+[PLAYER1]
+hand:
+graveyard:Drain Life
+life:22
+manapool:{W}{U}{U}{2}
+[PLAYER2]
+life:18
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/instill_energy_i166.txt b/projects/mtg/bin/Res/test/bugs/instill_energy_i166.txt
new file mode 100644
index 000000000..f266ba46e
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/instill_energy_i166.txt
@@ -0,0 +1,44 @@
+#NAME: Instill Energy
+#DESC: Instill Energy should allow
+#DESC: tapped creatures to untap.
+#DESC: See: http://code.google.com/p/wagic/issues/detail?id=166
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Grizzly Bears,Swamp,Forest,Plains
+hand:Instill Energy,Assassinate
+manapool:{G}
+[PLAYER2]
+[DO]
+Instill Energy
+Grizzly Bears
+next
+next
+Grizzly Bears
+next
+next
+next
+next
+# Try to untap Grizzly Bears.
+# Not sure whether this is supposed to work by
+# clicking on the bears or on the aura, so we
+# do both:
+Instill Energy
+Grizzly Bears
+# Now try to cast Assassinate on them. This will
+# only have an effect if the untapping failed.
+Swamp
+Forest
+Plains
+Assassinate
+Grizzly Bears
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:Swamp,Forest,Plains,Grizzly Bears,Instill Energy
+hand:Assassinate
+graveyard:
+manapool:{W}{B}{G}
+[PLAYER2]
+life:18
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/kjeldoran_frostbeast2_i167.txt b/projects/mtg/bin/Res/test/bugs/kjeldoran_frostbeast2_i167.txt
new file mode 100644
index 000000000..5b9c0bba5
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/kjeldoran_frostbeast2_i167.txt
@@ -0,0 +1,30 @@
+#NAME: Kjeldoran Frostbeast 2
+#DESC: Kjeldoran Frostbeast should only destroy
+#DESC: creatures that it actually is still
+#DESC: blocking at end of combat (unlike Basilisks
+#DESC: and Cockatrices). This means that a creature
+#DESC: that manages to destroy Kjeldoran Frostbeast
+#DESC: should not be destroyed at end of combat.
+#DESC: See: http://code.google.com/p/wagic/issues/detail?id=167
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Kjeldoran Frostbeast
+[PLAYER2]
+inplay:Earth Elemental
+[DO]
+Kjeldoran Frostbeast
+next
+Earth Elemental
+next
+next
+next
+[ASSERT]
+secondmain
+[PLAYER1]
+inplay:
+graveyard:Kjeldoran Frostbeast
+[PLAYER2]
+inplay:Earth Elemental
+graveyard:
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/kudzu_i168.txt b/projects/mtg/bin/Res/test/bugs/kudzu_i168.txt
new file mode 100644
index 000000000..075a8d92b
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/kudzu_i168.txt
@@ -0,0 +1,29 @@
+#NAME: Double-Kudzu crash test
+#DESC: Bug: Game crashes if a land with
+#DESC: two Kudzus in it is tapped.
+#DESC: See: http://code.google.com/p/wagic/issues/detail?id=168
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Swamp
+hand:Kudzu,Kudzu
+manapool:{G}{G}{G}{G}{G}{G}
+[PLAYER2]
+inplay:Mountain
+[DO]
+Kudzu
+Swamp
+Kudzu
+Swamp
+Swamp
+Mountain
+Mountain
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:
+graveyard:Swamp
+manapool:
+[PLAYER2]
+inplay:Mountain,Kudzu,Kudzu
+[END]
diff --git a/projects/mtg/bin/Res/test/dauntless_escort.txt b/projects/mtg/bin/Res/test/dauntless_escort.txt
new file mode 100644
index 000000000..9bfcb017d
--- /dev/null
+++ b/projects/mtg/bin/Res/test/dauntless_escort.txt
@@ -0,0 +1,64 @@
+#NAME: Dauntless Escort
+#DESC: Dauntless Escort was reported to
+#DESC: give Indestructibility indefinitely,
+#DESC: but this has been fixed by now.
+#DESC: The script pits two white attackers
+#DESC: against stronger green defenders.
+#DESC: The attackers should survive the first
+#DESC: attack due to being indestructible this
+#DESC: turn. Later the green creatures attack,
+#DESC: the white creatures defend, an now the
+#DESC: the whites should die, because their
+#DESC: indestructibility lasted only one turn.
+[INIT]
+combatbegin
+[PLAYER1]
+inplay:Dauntless Escort,Tundra Wolves,Savannah Lions
+library:Plains
+life:20
+[PLAYER2]
+inplay:Watchwolf,Craw Wurm
+library:Forest,Forest
+[DO]
+Dauntless Escort
+next
+Tundra Wolves
+Savannah Lions
+next
+Watchwolf
+Craw Wurm
+Craw Wurm
+eot
+# 2nd player does nothing:
+eot
+# 1st player does nothing:
+eot
+next
+next
+next
+next
+next
+# Now in combatattackers phase
+Watchwolf
+Craw Wurm
+next
+Tundra Wolves
+Savannah Lions
+Savannah Lions
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:
+graveyard:Dauntless Escort,Tundra Wolves,Savannah Lions
+hand:Plains
+life:20
+[PLAYER2]
+inplay:Watchwolf,Craw Wurm
+hand:Forest,Forest
+library:
+graveyard:
+life:20
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/fear_i147.txt b/projects/mtg/bin/Res/test/generic/fear_i147.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/fear_i147.txt
rename to projects/mtg/bin/Res/test/generic/fear_i147.txt
diff --git a/projects/mtg/bin/Res/test/generic/tokens.txt b/projects/mtg/bin/Res/test/generic/tokens.txt
index 36283dc9a..7fdfa0559 100644
--- a/projects/mtg/bin/Res/test/generic/tokens.txt
+++ b/projects/mtg/bin/Res/test/generic/tokens.txt
@@ -33,7 +33,7 @@ next
 [ASSERT]
 UPKEEP
 [PLAYER1]
-inplay:the hive
+inplay:1138
 [PLAYER2]
 inplay:hypnotic specter
 [END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/kjeldoran_frostbeast1.txt b/projects/mtg/bin/Res/test/kjeldoran_frostbeast1.txt
new file mode 100644
index 000000000..040d793ea
--- /dev/null
+++ b/projects/mtg/bin/Res/test/kjeldoran_frostbeast1.txt
@@ -0,0 +1,24 @@
+#NAME: Kjeldoran Frostbeast
+#DESC: Kjeldoran Frostbeast should destroy
+#DESC: creatures that block it or are blocked by it.
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Kjeldoran Frostbeast
+[PLAYER2]
+inplay:Giant Spider
+[DO]
+Kjeldoran Frostbeast
+next
+Giant Spider
+next
+next
+next
+[ASSERT]
+secondmain
+[PLAYER1]
+inplay:Kjeldoran Frostbeast
+[PLAYER2]
+inplay:
+graveyard:Giant Spider
+[END]