diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 59b6b818d..4a5f3dbe8 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -18401,6 +18401,8 @@ toughness=1
 [card]
 name=Elvish Berserker
 auto=rampage(1/1,0)
+auto=@attacking(this):2/2 ueot
+auto=@attacking(this):token(Zombie,Creature Zombie,2/2,black)*2
 text=Whenever Elvish Berserker becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
 mana={G}
 type=Creature
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index d4e7a1aab..bd2b2b604 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -73,14 +73,14 @@ generic/tokens2.txt
 generic/trample.txt
 generic/trample_vs_indestructible.txt
 generic/trample_vs_multiblock.txt
-generic/triggers_at_movedto_i179.txt
-generic/triggers_attacking.txt
-generic/triggers_blocking.txt
-generic/triggers_combatdamaged_1.txt
-generic/triggers_combatdamaged_2.txt
-generic/triggers_drawn.txt
-generic/triggers_noncombatdamaged.txt
-generic/triggers_untapped.txt
+generic/trigger_at_movedto_i179.txt
+generic/trigger_attacking.txt
+generic/trigger_blocking.txt
+generic/trigger_combatdamaged_1.txt
+generic/trigger_combatdamaged_2.txt
+generic/trigger_drawn.txt
+generic/trigger_noncombatdamaged.txt
+generic/trigger_untapped.txt
 generic/wither.txt
 ########################
 #Specific Cards
diff --git a/projects/mtg/bin/Res/test/helm_of_kaldra1.txt b/projects/mtg/bin/Res/test/helm_of_kaldra1.txt
index c900603e5..996ce86ce 100644
--- a/projects/mtg/bin/Res/test/helm_of_kaldra1.txt
+++ b/projects/mtg/bin/Res/test/helm_of_kaldra1.txt
@@ -13,6 +13,7 @@ inplay:Lightning Elemental
 [DO]
 Grizzly Bears
 Helm of Kaldra
+choice 0
 Grizzly Bears
 next
 next