diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index a409c0b2a..5e2363d05 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -34,6 +34,9 @@ generic/targetController_life.txt
 generic/targetController_life2.txt
 generic/targetController_damage.txt
 generic/tokens.txt
+generic/trample.txt
+generic/trample_vs_indestructible.txt
+generic/trample_vs_multiblock.txt
 generic/wither.txt
 ########################
 #Specific Cards
diff --git a/projects/mtg/bin/Res/test/bugs/bravado_i190.txt b/projects/mtg/bin/Res/test/bugs/bravado_i190.txt
new file mode 100644
index 000000000..0ab26fb5e
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/bravado_i190.txt
@@ -0,0 +1,28 @@
+#NAME: Bravado on opponent's creature
+#DESC: Bug: Bravado works correctly when cast on
+#DESC: one's own creature, but incorrectly if cast
+#DESC: on an opponent's creature. Unfortunately
+#DESC: that's exactly what the AI does when it
+#DESC: gets the card in Random Deck mode.
+#DESC: See http://code.google.com/p/wagic/issues/detail?id=190
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Craw Wurm,Raging Goblin,Scryb Sprites
+hand:Bravado,Shock
+manapool:{R}{R}{R}
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+Bravado
+Grizzly Bears
+Shock
+Grizzly Bears
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:Craw Wurm,Raging Goblin,Scryb Sprites,Bravado
+graveyard:Shock
+[PLAYER2]
+graveyard:Grizzly Bears
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/first_and_double_strike1_i187.txt b/projects/mtg/bin/Res/test/bugs/first_and_double_strike1_i187.txt
new file mode 100644
index 000000000..ceb0d4755
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/first_and_double_strike1_i187.txt
@@ -0,0 +1,26 @@
+#NAME: First Strike on Double Strike
+#DESC: Hearthfire Hobgoblin should keep his
+#DESC: Double Strike after Bloodmark Mentor
+#DESC: (which gives First Strike) has been
+#DESC: summoned.
+#DESC: See http://code.google.com/p/wagic/issues/detail?id=187
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Hearthfire Hobgoblin
+hand:Bloodmark Mentor
+manapool:{R}{R}
+[PLAYER2]
+[DO]
+Bloodmark Mentor
+next
+next
+Hearthfire Hobgoblin
+eot
+[ASSERT]
+untap
+[PLAYER1]
+inplay:Hearthfire Hobgoblin,Bloodmark Mentor
+[PLAYER2]
+life:16
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/first_and_double_strike2_i187.txt b/projects/mtg/bin/Res/test/bugs/first_and_double_strike2_i187.txt
new file mode 100644
index 000000000..911fb703a
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/first_and_double_strike2_i187.txt
@@ -0,0 +1,25 @@
+#NAME: Double Strike on First Strike
+#DESC: White Knight (which has First Strike) should
+#DESC: gain Double Strike after Kinsbaile Cavalier
+#DESC: has been summoned.
+#DESC: See http://code.google.com/p/wagic/issues/detail?id=187
+[INIT]
+firstmain
+[PLAYER1]
+inplay:White Knight
+hand:Kinsbaile Cavalier
+manapool:{W}{W}{W}{W}
+[PLAYER2]
+[DO]
+Kinsbaile Cavalier
+next
+next
+White Knight
+eot
+[ASSERT]
+untap
+[PLAYER1]
+inplay:White Knight,Kinsbaile Cavalier
+[PLAYER2]
+life:16
+[END]
diff --git a/projects/mtg/bin/Res/test/bugs/glimpse_of_nature_i186.txt b/projects/mtg/bin/Res/test/bugs/glimpse_of_nature_i186.txt
new file mode 100644
index 000000000..da7d3e768
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/glimpse_of_nature_i186.txt
@@ -0,0 +1,24 @@
+#NAME: Glimpse of Nature card drawing
+#DESC: Bug: Casting Glimpse of Nature (CHK)
+#DESC: doesn't let you draw cards when you
+#DESC: summon creatures this turn.
+#DESC: See http://code.google.com/p/wagic/issues/detail?id=186
+[INIT]
+firstmain
+[PLAYER1]
+hand:Glimpse of Nature,Grizzly Bears
+library:Forest,Swamp
+manapool:{G}{G}{G}
+[PLAYER2]
+[DO]
+Glimpse of Nature
+Grizzly Bears
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:Grizzly Bears
+hand:Forest
+library:Swamp
+graveyard:Glimpse of Nature
+[PLAYER2]
+[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
new file mode 100644
index 000000000..fe44edd0f
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/lorescale_coatl_repulsed_i189.txt
@@ -0,0 +1,32 @@
+#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/seismic_spike_i191.txt b/projects/mtg/bin/Res/test/bugs/seismic_spike_i191.txt
new file mode 100644
index 000000000..ae1177ef1
--- /dev/null
+++ b/projects/mtg/bin/Res/test/bugs/seismic_spike_i191.txt
@@ -0,0 +1,23 @@
+#NAME: Test Template
+#DESC: 
+#DESC: 
+#DESC: 
+#DESC: 
+[INIT]
+firstmain
+[PLAYER1]
+hand:Seismic Spike
+manapool:{R}{R}{R}{R}
+[PLAYER2]
+inplay:Plains
+[DO]
+Seismic Spike
+Plains
+[ASSERT]
+firstmain
+[PLAYER1]
+graveyard:Seismic Spike
+manapool:{R}{R}
+[PLAYER2]
+graveyard:Plains
+[END]
diff --git a/projects/mtg/bin/Res/test/generic/trample.txt b/projects/mtg/bin/Res/test/generic/trample.txt
new file mode 100644
index 000000000..612b48d6b
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/trample.txt
@@ -0,0 +1,25 @@
+#NAME: Trample
+#DESC: Simple Trample test.
+#DESC: Relies on Trample default damage as
+#DESC: calculated in the combatdamage step.
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Crash of Rhinos
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+Crash of Rhinos
+next
+Grizzly Bears
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Crash of Rhinos
+[PLAYER2]
+graveyard:Grizzly Bears
+life:14
+[END]
diff --git a/projects/mtg/bin/Res/test/generic/trample_vs_indestructible.txt b/projects/mtg/bin/Res/test/generic/trample_vs_indestructible.txt
new file mode 100644
index 000000000..ce80e0533
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/trample_vs_indestructible.txt
@@ -0,0 +1,26 @@
+#NAME: Trample vs indestructible defender
+#DESC: Tests whether the attacker can correctly
+#DESC: trample over an indestructible defender.
+#DESC: Relies on Trample default damage as
+#DESC: calculated in the combatdamage step.
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Crash of Rhinos
+[PLAYER2]
+inplay:Timber Protector,Timber Protector
+[DO]
+Crash of Rhinos
+next
+Timber Protector
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+graveyard:Crash of Rhinos
+[PLAYER2]
+inplay:Timber Protector,Timber Protector
+life:19
+[END]
diff --git a/projects/mtg/bin/Res/test/generic/trample_vs_multiblock.txt b/projects/mtg/bin/Res/test/generic/trample_vs_multiblock.txt
new file mode 100644
index 000000000..aa7ed23e1
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/trample_vs_multiblock.txt
@@ -0,0 +1,26 @@
+#NAME: Trample vs two blockers
+#DESC: Relies on Trample default damage as
+#DESC: calculated in the combatdamage step.
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Crash of Rhinos
+[PLAYER2]
+inplay:Scryb Sprites,Grizzly Bears
+[DO]
+Crash of Rhinos
+next
+Scryb Sprites
+Grizzly Bears
+next
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Crash of Rhinos
+[PLAYER2]
+graveyard:Scryb Sprites,Grizzly Bears
+life:15
+[END]