diff --git a/projects/mtg/bin/Res/test/Blink_and_X_counters.txt b/projects/mtg/bin/Res/test/Blink_and_X_counters.txt
index 9e12ff2eb..00d91d82e 100644
--- a/projects/mtg/bin/Res/test/Blink_and_X_counters.txt
+++ b/projects/mtg/bin/Res/test/Blink_and_X_counters.txt
@@ -17,6 +17,7 @@ manapool:{3}{G}
 [PLAYER2]
 [DO]
 Ivy Elemental
+choice 3
 # add mana to pool
 plains
 mountain
diff --git a/projects/mtg/bin/Res/test/Distorting_Wake.txt b/projects/mtg/bin/Res/test/Distorting_Wake.txt
index 3e80292fd..948d1b8ad 100644
--- a/projects/mtg/bin/Res/test/Distorting_Wake.txt
+++ b/projects/mtg/bin/Res/test/Distorting_Wake.txt
@@ -9,9 +9,11 @@ manapool:{3}{U}{U}{U}
 [PLAYER2]
 [DO]
 Distorting Wake
+choice 3
 Mox Pearl
 Ornithopter
 Grizzly Bears
+Distorting Wake
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/Distorting_Wake2.txt b/projects/mtg/bin/Res/test/Distorting_Wake2.txt
index 6a862371a..0ecf1733d 100644
--- a/projects/mtg/bin/Res/test/Distorting_Wake2.txt
+++ b/projects/mtg/bin/Res/test/Distorting_Wake2.txt
@@ -9,6 +9,7 @@ manapool:{3}{U}{U}{U}
 [PLAYER2]
 [DO]
 Distorting Wake
+choice 3
 choice 0
 Mox Pearl
 Ornithopter
diff --git a/projects/mtg/bin/Res/test/counter_unless_pay_x.txt b/projects/mtg/bin/Res/test/counter_unless_pay_x.txt
index e68e3a0fd..474c932e3 100644
--- a/projects/mtg/bin/Res/test/counter_unless_pay_x.txt
+++ b/projects/mtg/bin/Res/test/counter_unless_pay_x.txt
@@ -14,7 +14,9 @@ think twice
 no
 yes
 syncopate
+choice 3
 think twice
+syncopate
 choice 0
 [ASSERT]
 firstmain
diff --git a/projects/mtg/bin/Res/test/death_grasp.txt b/projects/mtg/bin/Res/test/death_grasp.txt
index 4c3bcd370..bcb78804d 100644
--- a/projects/mtg/bin/Res/test/death_grasp.txt
+++ b/projects/mtg/bin/Res/test/death_grasp.txt
@@ -10,7 +10,9 @@ manapool:{W}{B}{10}
 [PLAYER2]
 [DO]
 Death Grasp
+choice 10
 p2
+Death Grasp
 [ASSERT]
 firstmain
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/decree_of_justice.txt b/projects/mtg/bin/Res/test/decree_of_justice.txt
index 99f69e540..a1214a66f 100644
--- a/projects/mtg/bin/Res/test/decree_of_justice.txt
+++ b/projects/mtg/bin/Res/test/decree_of_justice.txt
@@ -8,6 +8,7 @@ manapool:{8}{W}{W}
 [DO]
 Decree of Justice
 choice 0
+choice 6
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/drain_life.txt b/projects/mtg/bin/Res/test/drain_life.txt
index 2c7d01a11..a62582cf5 100644
--- a/projects/mtg/bin/Res/test/drain_life.txt
+++ b/projects/mtg/bin/Res/test/drain_life.txt
@@ -9,7 +9,9 @@ inplay:1099
 life:20
 [DO]
 1156
+choice 3
 1099
+1156
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/fault_line.txt b/projects/mtg/bin/Res/test/fault_line.txt
index 360ff761a..fb1c3695d 100644
--- a/projects/mtg/bin/Res/test/fault_line.txt
+++ b/projects/mtg/bin/Res/test/fault_line.txt
@@ -8,6 +8,7 @@ manapool:{1}{R}{R}
 inplay:grizzly bears
 [DO]
 fault line
+choice 1
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/feral_hydra.txt b/projects/mtg/bin/Res/test/feral_hydra.txt
index d1db67c5f..a021fd29a 100644
--- a/projects/mtg/bin/Res/test/feral_hydra.txt
+++ b/projects/mtg/bin/Res/test/feral_hydra.txt
@@ -6,6 +6,7 @@ hand:Feral Hydra
 [player2]
 [do]
 Feral Hydra
+choice 5
 eot
 eot
 next
diff --git a/projects/mtg/bin/Res/test/fireball_i583.txt b/projects/mtg/bin/Res/test/fireball_i583.txt
index 4675e87d9..cc5fe90cf 100644
--- a/projects/mtg/bin/Res/test/fireball_i583.txt
+++ b/projects/mtg/bin/Res/test/fireball_i583.txt
@@ -10,6 +10,7 @@ inplay:raging goblin,Akrasan Squire,Alpha Myr,Ambush Party,Apprentice Wizard,Arb
 [PLAYER2]
 [DO]
 fireball
+choice 14
 raging goblin
 Akrasan Squire
 Alpha Myr
@@ -19,6 +20,7 @@ Arbor Elf
 Aven Squire
 Bay Falcon
 Alpha Myr
+next
 fireball
 [ASSERT]
 FIRSTMAIN
diff --git a/projects/mtg/bin/Res/test/flowstone_slide.txt b/projects/mtg/bin/Res/test/flowstone_slide.txt
index 064c2321c..a8662e584 100644
--- a/projects/mtg/bin/Res/test/flowstone_slide.txt
+++ b/projects/mtg/bin/Res/test/flowstone_slide.txt
@@ -8,6 +8,7 @@ hand:Flowstone slide
 [PLAYER2]
 [DO]
 Flowstone slide
+choice 1
 next
 #begin
 next
diff --git a/projects/mtg/bin/Res/test/gelatinous_genesis.txt b/projects/mtg/bin/Res/test/gelatinous_genesis.txt
index 63e62a814..2654ff8da 100644
--- a/projects/mtg/bin/Res/test/gelatinous_genesis.txt
+++ b/projects/mtg/bin/Res/test/gelatinous_genesis.txt
@@ -8,6 +8,7 @@ manapool:{6}{G}
 [PLAYER2]
 [DO]
 Gelatinous Genesis
+choice 6
 Mox Ruby
 Mox Emerald
 Pyroclasm
diff --git a/projects/mtg/bin/Res/test/goblin_offensive.txt b/projects/mtg/bin/Res/test/goblin_offensive.txt
index 009ad0bf9..4c78cad0c 100644
--- a/projects/mtg/bin/Res/test/goblin_offensive.txt
+++ b/projects/mtg/bin/Res/test/goblin_offensive.txt
@@ -7,6 +7,7 @@ hand:goblin offensive
 [PLAYER2]
 [DO]
 goblin offensive
+choice 5
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/howl_from_beyond.txt b/projects/mtg/bin/Res/test/howl_from_beyond.txt
index ccb5815aa..73fb4fcb1 100644
--- a/projects/mtg/bin/Res/test/howl_from_beyond.txt
+++ b/projects/mtg/bin/Res/test/howl_from_beyond.txt
@@ -8,7 +8,9 @@ hand:howl from beyond
 [PLAYER2]
 [DO]
 howl from beyond
+choice 5
 grizzly bears
+howl from beyond
 next
 #begin
 next
diff --git a/projects/mtg/bin/Res/test/hurricane.txt b/projects/mtg/bin/Res/test/hurricane.txt
index 8aabae80e..b46456ca0 100644
--- a/projects/mtg/bin/Res/test/hurricane.txt
+++ b/projects/mtg/bin/Res/test/hurricane.txt
@@ -9,6 +9,7 @@ manapool:{4}{G}
 inplay:serra angel
 [DO]
 hurricane
+choice 4
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/ivy_elemental.txt b/projects/mtg/bin/Res/test/ivy_elemental.txt
index f29b74eb0..1a5b78b41 100644
--- a/projects/mtg/bin/Res/test/ivy_elemental.txt
+++ b/projects/mtg/bin/Res/test/ivy_elemental.txt
@@ -9,6 +9,7 @@ manapool:{G}{G}{G}{G}
 [PLAYER2]
 [DO]
 Ivy Elemental
+choice 3
 next
 #begin
 next
diff --git a/projects/mtg/bin/Res/test/leyline_of_the_void.txt b/projects/mtg/bin/Res/test/leyline_of_the_void.txt
index 48bf357b2..0439dbf38 100644
--- a/projects/mtg/bin/Res/test/leyline_of_the_void.txt
+++ b/projects/mtg/bin/Res/test/leyline_of_the_void.txt
@@ -13,6 +13,7 @@ library:Mountain
 Forbidden Orchard
 choice 2
 Black Sun's Zenith
+choice 13
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/prosperity.txt b/projects/mtg/bin/Res/test/prosperity.txt
index cc4eeacec..10cb4b07b 100644
--- a/projects/mtg/bin/Res/test/prosperity.txt
+++ b/projects/mtg/bin/Res/test/prosperity.txt
@@ -9,6 +9,7 @@ manapool:{2}{U}
 library:plains,forest,mountain
 [DO]
 prosperity
+choice 2
 [ASSERT]
 FIRSTMAIN
 [PLAYER1]
diff --git a/projects/mtg/bin/Res/test/unwilling_recruit.txt b/projects/mtg/bin/Res/test/unwilling_recruit.txt
index 44af4b9be..af5f2d879 100644
--- a/projects/mtg/bin/Res/test/unwilling_recruit.txt
+++ b/projects/mtg/bin/Res/test/unwilling_recruit.txt
@@ -21,7 +21,9 @@ next
 plains
 swamp
 Unwilling Recruit
+choice 2
 grizzly bears
+Unwilling Recruit
 next
 #begin
 next
diff --git a/projects/mtg/bin/Res/test/volcanic_eruption.txt b/projects/mtg/bin/Res/test/volcanic_eruption.txt
index 595ac13fe..c875a9881 100644
--- a/projects/mtg/bin/Res/test/volcanic_eruption.txt
+++ b/projects/mtg/bin/Res/test/volcanic_eruption.txt
@@ -8,6 +8,7 @@ manapool:{U}{U}{U}{W}{W}
 inplay:1389,1390,1391
 [DO]
 1231
+choice 2
 1389
 1390
 1231