diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 997724088..f08bb90d5 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -19417,8 +19417,6 @@ type=Instant
 [/card]
 [card]
 name=Memory Sluice
-target=player
-auto=deplete:4
 text=Target player puts the top four cards of his or her library into his or her graveyard. -- Conspire (As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.)
 mana={UB}
 type=Sorcery
@@ -19433,15 +19431,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Mephidross Vampire
-text=Flying -- Each creature you control is a Vampire in addition to its other creature types and has "Whenever this creature deals damage to a creature, put a +1/+1 counter on this creature."
-mana={4}{B}{B}
-type=Creature
-subtype=Vampire
-power=3
-toughness=4
-[/card]
-[card]
 name=Mercadian Atlas
 text=At the beginning of your end step, if you didn't play a land this turn, you may draw a card.
 mana={5}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index db14bc0f3..b25437ba7 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -31989,6 +31989,18 @@ mana={U}
 type=Instant
 [/card]
 [card]
+name=Mephidross Vampire
+abilities=flying
+auto=@damaged(creature) from(creature|mybattlefield):all(trigger[from]) counter(1/1,1)
+auto=lord(creature) transforms(vampire)
+text=Flying -- Each creature you control is a Vampire in addition to its other creature types and has "Whenever this creature deals damage to a creature, put a +1/+1 counter on this creature."
+mana={4}{B}{B}
+type=Creature
+subtype=Vampire
+power=3
+toughness=4
+[/card]
+[card]
 name=Mephitic Ooze
 abilities=deathtouch
 auto=foreach(artifact|myBattlefield)1/0
@@ -40538,7 +40550,6 @@ type=Sorcery
 name=Rancor
 target=creature
 autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
-#auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=2/0
 auto=trample
 text=Enchant creature -- Enchanted creature gets +2/+0 and has trample. -- When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand.
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 52d1a35e7..d32e5cd3e 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -212,6 +212,7 @@ drain_life.txt
 dream_fracture_i142.txt
 drift_of_the_dead.txt
 dromad_purebred.txt
+dross_golem.txt
 dross_harvester.txt
 duskwalker.txt
 dust_corona.txt
@@ -311,6 +312,7 @@ juniper_order_ranger.txt
 karns_touch_i233.txt
 keldon_warlord.txt
 keldon_warlord2.txt
+khalni_hydra.txt
 kird_ape.txt
 kjeldoran_frostbeast1.txt
 kjeldoran_frostbeast2_i167.txt
@@ -347,6 +349,7 @@ maze_of_ith.txt
 meekstone.txt
 memnarch.txt
 memory_erosion.txt
+mephidross_vampire.txt
 millstone.txt
 mirri_the_cursed.txt
 mirri_the_cursed2_i284.txt
@@ -393,6 +396,7 @@ rampant_growth.txt
 rancor.txt
 ray_of_command.txt
 ray_of_command_i176.txt
+razor_golem.txt
 reclusive_wight.txt
 reclusive_wight2.txt
 recover.txt
diff --git a/projects/mtg/bin/Res/test/dross_golem.txt b/projects/mtg/bin/Res/test/dross_golem.txt
new file mode 100644
index 000000000..af35b38e1
--- /dev/null
+++ b/projects/mtg/bin/Res/test/dross_golem.txt
@@ -0,0 +1,18 @@
+#Testing Dross Golem (keyword:AFFINITYSWAMP)
+#Affinity for swamps (This spell costs {1} less to cast for each swamp you control.)
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Swamp,Swamp,Swamp,Swamp
+hand:Dross Golem
+manapool:{1}
+[PLAYER2]
+[DO]
+Dross Golem
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Swamp,Swamp,Swamp,Swamp,Dross Golem
+manapool:{0}
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/khalni_hydra.txt b/projects/mtg/bin/Res/test/khalni_hydra.txt
new file mode 100644
index 000000000..96b294005
--- /dev/null
+++ b/projects/mtg/bin/Res/test/khalni_hydra.txt
@@ -0,0 +1,18 @@
+#Testing Khalni Hydra (keyword:AFFINITYGREENCREATURES)
+#Affinity for swamps (This spell costs {G} less to cast for each green creature you control.)
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Grizzly Bears,Grizzly Bears,Grizzly Bears,Grizzly Bears
+hand:Khalni Hydra
+manapool:{G}{G}{G}{G}
+[PLAYER2]
+[DO]
+Khalni Hydra
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Grizzly Bears,Grizzly Bears,Grizzly Bears,Grizzly Bears,Khalni Hydra
+manapool:{0}
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/mephidross_vampire.txt b/projects/mtg/bin/Res/test/mephidross_vampire.txt
new file mode 100644
index 000000000..f656861df
--- /dev/null
+++ b/projects/mtg/bin/Res/test/mephidross_vampire.txt
@@ -0,0 +1,44 @@
+#Testing Mephidross Vampire.
+[INIT]
+COMBATATTACKERS
+[PLAYER1]
+inplay:Mephidross Vampire,Hill Giant
+[PLAYER2]
+inplay:Grizzly Bears
+life:20
+[DO]
+Hill Giant
+next
+Grizzly Bears
+next
+next
+#combat end
+next
+#main 2
+eot
+eot
+#untap
+next
+#upkeep
+next
+#draw
+next
+#main
+next
+#combat
+next
+#attackers
+Hill Giant
+next
+#blockers
+next
+#damage
+next
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Mephidross Vampire,Hill Giant
+[PLAYER2]
+graveyard:Grizzly Bears
+life:16
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/razor_golem.txt b/projects/mtg/bin/Res/test/razor_golem.txt
new file mode 100644
index 000000000..276320fd7
--- /dev/null
+++ b/projects/mtg/bin/Res/test/razor_golem.txt
@@ -0,0 +1,18 @@
+#Testing Razor Golem (keyword:AFFINITYPLAINS)
+#Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Plains,Plains,Plains,Plains,Plains
+hand:Razor Golem
+manapool:{1}
+[PLAYER2]
+[DO]
+Razor Golem
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Plains,Plains,Plains,Plains,Plains,Razor Golem
+manapool:{0}
+[PLAYER2]
+[END]
\ No newline at end of file