diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index b85a10ee4..482992174 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -1,2 +1,517 @@
+########################
+#Generic engine features
+########################
+generic/attacks_each_turn.txt
+generic/cycling.txt
+generic/cycling2.txt
+generic/deathtouch.txt
+generic/doesnotuntap.txt
+generic/doesnotuntap2.txt
+generic/double_strike.txt
+generic/equip_landfall_buff.txt
+generic/equip_reach.txt
+generic/equip_shroud.txt
+generic/equip_shroud2.txt
+generic/equip_wither.txt
+generic/equipment_i252.txt
+generic/exalted.txt
+generic/exalted_i143.txt
+generic/exalted_i310.txt
+generic/fear.txt
+generic/fear_i147.txt
+generic/first_and_double_strike1_i187.txt
+generic/first_and_double_strike2_i187.txt
+generic/first_strike.txt
+generic/first_strike2.txt
+generic/first_strike3.txt
+generic/hybrid_mana.txt
+generic/hybrid_mana_2.txt
+generic/hybrid_mana_3.txt
+generic/kicker.txt
+generic/kicker2.txt
+generic/landwalk.txt
+generic/legendary.txt
+generic/level_up.txt
+generic/level_up2.txt
+generic/lord_counter.txt
+generic/lord_counter_any.txt
+generic/lifelink.txt
+generic/m10_blockers.txt
+generic/m10_blockers2.txt
+generic/must1.txt
+generic/must2.txt
+generic/nofizzle.txt
+generic/oneblocker.txt
+generic/persist.txt
+generic/persist2.txt
+generic/persist3.txt
+generic/phases.txt
+generic/rampage.txt
+generic/rampage2.txt
+generic/rampage3.txt
+generic/rampage_vs_first_strike.txt
+generic/regenerate.txt
+generic/regenerate_wither_i146.txt
+generic/sacrifice.txt
+generic/summoning_sickness.txt
+generic/tap_other_card_as_cost.txt
+generic/targetController_life.txt
+generic/targetController_life2.txt
+generic/targetController_damage.txt
+generic/thisforeach.txt
+generic/tokens.txt
+generic/tokens2.txt
+generic/trample.txt
+generic/trample_vs_indestructible.txt
+generic/trample_vs_multiblock.txt
+generic/triggers_at_movedto_i179.txt
+generic/wither.txt
+########################
+#Specific Cards
+########################
+act_of_treason.txt
+aegis_of_the_meek.txt
+aether_mutation.txt
+aether_flash.txt
+afflict.txt
+akron_legionnaire.txt
 alabaster_dragon.txt
-rancor1.txt
\ No newline at end of file
+alabaster_leech.txt
+alabaster_leech2.txt
+alluring_siren.txt
+Amugaba.txt
+anarchy.txt
+ancestors_chosen.txt
+angry_mob1.txt
+angry_mob2.txt
+angry_mob3.txt
+angry_mob4.txt
+angry_mob4b.txt
+angry_mob5.txt
+angry_mob7.txt
+animate_artifact.txt
+animate_artifact2.txt
+animate_dead.txt
+animate_dead2.txt
+animate_dead3.txt
+animated_legendaries1_i221.txt
+animated_legendaries2_i221.txt
+animated_legendaries3_i221.txt
+ankh_of_mishra.txt
+arcanis_the_omnipotent.txt
+arcanis_the_omnipotent2.txt
+arcbound.txt
+ardakar_wastes.txt
+ardent_soldier.txt
+argothian_enchantress.txt
+armadillo_cloak.txt
+ascendant_evincar.txt
+ascendant_evincar2.txt
+ascendant_evincar3.txt
+ashen_firebeast.txt
+ashen_firebeast2.txt
+aura_mutation.txt
+avarice_totem.txt
+aven_riftwatcher.txt
+aven_riftwatcher2.txt
+aysen_bureaucrats.txt
+balduvian_conjurer.txt
+baneslayer_angel.txt
+baneslayer_angel2.txt
+barbed_sliver.txt
+basal_sliver.txt
+beacon_of_creation.txt
+beacon_of_destruction.txt
+beacon_of_unrest.txt
+behemoth_sledge.txt
+behemoth_sledge2.txt
+behemoth_sledge3.txt
+behemoth_sledge4.txt
+behemoth_sledge5.txt
+belligerent_hatchling.txt
+benalish_knight.txt
+biorhythm.txt
+black_market.txt
+black_vise.txt
+blessed_wind.txt
+blessed_wine.txt
+blinking_spirit.txt
+blinkmoth_nexus.txt
+bloated_toad1.txt
+bloated_toad2.txt
+bloodfire_colossus.txt
+bloodhall_ooze.txt
+bloodscale_prowler.txt
+body_double.txt
+boggart_arsonists.txt
+borderland_behemoth.txt
+bottle_gnomes.txt
+bottle_gnomes2.txt
+brainstorm.txt
+bramblewood_paragon.txt
+brass_man.txt
+brass_man_i161.txt
+briarhorn.txt
+cage_of_hands.txt
+Call_to_Heel_1.txt
+Call_to_Heel_2.txt
+castle.txt
+cathodion.txt
+celestial_purge.txt
+chainbreaker.txt
+circle_of_protection.txt
+circle_of_protection_i211.txt
+civic_wayfinder.txt
+clone.txt
+clone2.txt
+clone3.txt
+cockatrice.txt
+cockatrice_i228.txt
+colossus_of_sardia1.txt
+colossus_of_sardia2.txt
+composite_golem.txt
+conservator.txt
+control_magic.txt
+control_magic2.txt
+control_magic3.txt
+control_magic4.txt
+corrupt.txt
+counsel_of_the_soratami.txt
+counterspell.txt
+counterspell2.txt
+counterspell3.txt
+counterspell4.txt
+cranial_plating.txt
+creature_bond.txt
+curiosity1_i217.txt
+curiosity2_i217.txt
+crimson_kobolds.txt
+crosis_s_catacombs_1.txt
+crosis_s_catacombs_2.txt
+crumble.txt
+crystal_rod_i172.txt
+dark_banishing.txt
+dauntless_escort.txt
+dauthi_embrace.txt
+death_grasp.txt
+death_ward.txt
+decree_of_justice.txt
+deja_vu.txt
+delusions_of_mediocrity.txt
+dematerialize_flashback.txt
+dingus_egg.txt
+dingus_staff_i153.txt
+divergent_growth.txt
+doomed_necromancer.txt
+double_strike_i145.txt
+double_strike2_i145.txt
+dragon_fodder.txt
+dragon_fodder2.txt
+dragon_whelp_i154.txt
+drain_life.txt
+dream_fracture_i142.txt
+drift_of_the_dead.txt
+dromad_purebred.txt
+dross_harvester.txt
+duskwalker.txt
+dust_corona.txt
+dwarven_warriors.txt
+ebony_horse.txt
+ekundu_cyclops1_i218.txt
+ekundu_cyclops2_i218.txt
+elvish_piper.txt
+elvish_promenade.txt
+emblem_of_the_warmind.txt
+enchanted evening.txt
+enervate.txt
+enchantress_s_presence.txt
+erg_raiders_i157.txt
+explore.txt
+fangren_pathcutter.txt
+farhaven_elf.txt
+farmstead.txt
+fastbond.txt
+fastbond2.txt
+fault_line.txt
+feral_hydra.txt
+fieldmist_borderpost.txt
+fire_tempest.txt
+firebreathing.txt
+fists_of_ironwood.txt
+flagstones.txt
+flame_fusillade_i265.txt
+flare.txt
+fledgling_imp.txt
+fledgling_imp2.txt
+fleshformer.txt
+flowstone_hellion.txt
+flowstone_slide.txt
+fog.txt
+fog_bank.txt
+foratog.txt
+force_of_nature.txt
+force_of_nature2.txt
+force_of_nature3.txt
+fountain_of_youth.txt
+frogmite.txt
+fungus_sliver.txt
+gamble.txt
+gelatinous_generation.txt
+gempalm_avenger.txt
+ghost_warden.txt
+glen_elendra_archmage_i222.txt
+giant_growth.txt
+giant_growth2.txt
+Glimmervoid.txt
+glimpse_the_unthinkable.txt
+gnarled_effigy.txt
+gnat_alley_creeper1.txt
+gnat_alley_creeper2.txt
+goblin_balloon_brigade.txt
+goblin_balloon_brigade2.txt
+goblin_gardener.txt
+goblin_king.txt
+goblin_lackey1.txt
+goblin_lackey2.txt
+goblin_lackey3.txt
+goblin_lackey4.txt
+goblin_offensive.txt
+goblin_razerunners.txt
+golgari_germination_i153.txt
+gravedigger.txt
+gravity_well.txt
+gravity_well2.txt
+great_defender.txt
+hannas_custody.txt
+harpoon_sniper.txt
+hellfire.txt
+helm_of_kaldra1.txt
+holy_day_i226.txt
+hope_charm_i267.txt
+hopping_automaton_i232.txt
+horned_helm.txt
+howl_from_beyond.txt
+howl_of_the_night_pack.txt
+hunting_pack.txt
+hurricane.txt
+hyalopterous_lemure.txt
+hymn_of_rebirth.txt
+hypnotic_specter.txt
+icatian_priest.txt
+imaginary_pet.txt
+immaculate_magistrate.txt
+incinerate.txt
+instill_energy_i166.txt
+iron_will_i270.txt
+ivy_elemental.txt
+jodahs_avenger.txt
+juggernaut.txt
+jump.txt
+juniper_order_ranger.txt
+karns_touch_i233.txt
+keldon_warlord.txt
+keldon_warlord2.txt
+kird_ape.txt
+kjeldoran_frostbeast1.txt
+kjeldoran_frostbeast2_i167.txt
+knight_captain_of_eos_i294.txt
+knight_captain_of_eos_i294_2.txt
+kormus_bell_i301.txt
+krosan_beast.txt
+krosan_beast2.txt
+kraken_eye.txt
+kraken_eye2.txt
+kraken_eye3.txt
+kraken_eye4.txt
+kudzu.txt
+kudzu2.txt
+kudzu_i168.txt
+leveler.txt
+lhurgoyf.txt
+liability.txt
+lifeforce.txt
+lifetap.txt
+lightmine_field1.txt
+lightmine_field2.txt
+living_artifact_i169.txt
+living_lands.txt
+lord_of_the_pit.txt
+lord_of_the_pit2.txt
+martial_coup.txt
+martial_coup2.txt
+master_decoy.txt
+master_of_etherium.txt
+masticore.txt
+masticore2.txt
+maze_of_ith.txt
+meekstone.txt
+memnarch.txt
+memory_erosion.txt
+millstone.txt
+mirri_the_cursed.txt
+mirri_the_cursed2_i284.txt
+misc01.txt
+moat.txt
+mobile_fort.txt
+mortuary.txt
+nantuko_husk.txt
+natural_order.txt
+necrogenesis.txt
+Nevinyrrals_Disk.txt
+Nevinyrrals_Disk2.txt
+nightmare.txt
+northern_paladin.txt
+northern_paladin2.txt
+Nyxathid.txt
+ondu_cleric.txt
+OneDozenEyes.txt
+orcish_artillery.txt
+orcish_lumberjack.txt
+overrun.txt
+paralysis.txt
+paralysis2.txt
+persuasion.txt
+phytohydra.txt
+plague_rats.txt
+plumes_of_peace_i260.txt
+pouncing_jaguar_i425.txt
+promise_of_bunrei_i305.txt
+prosperity.txt
+protomatter_powder.txt
+prowess_of_the_fair.txt
+prowess_of_the_fair2.txt
+prowess_of_the_fair3.txt
+pygmy_troll.txt
+pyknite_i426.txt
+pyroclasm.txt
+quilled_sliver.txt
+rain_of_filth_i206.txt
+rain_of_filth_i283.txt
+rakdos_pit_dragon_WITH_hellbent.txt
+rakdos_pit_dragon_WITHOUT_hellbent.txt
+rampant_growth.txt
+rancor.txt
+ray_of_command.txt
+ray_of_command_i176.txt
+reclusive_wight.txt
+reclusive_wight2.txt
+recover.txt
+regal_force.txt
+resounding_roar.txt
+resurrection.txt
+resuscitate_i210.txt
+righteous_cause.txt
+river_kelpie2_i335.txt
+rockslide_elemental.txt
+rootwalla.txt
+royal_assassin.txt
+sacred_foundry_i275.txt
+safehold_duo.txt
+safe_passage.txt
+samite_healer.txt
+scourge_of_kher_ridges.txt
+scourge_of_kher_ridges2.txt
+scourglass.txt
+scouts_warning.txt
+scute_mob.txt
+sedge_sliver.txt
+seedcradle_witch.txt
+seismic_assault.txt
+seismic_spike_i191.txt
+selesnya_guildmage.txt
+shard_volley.txt
+silver_seraph_i300.txt
+skullcage0_i239.txt
+skullcage1_i239.txt
+skullcage2_i239.txt
+skullcage3_i239.txt
+skullcage4_i239.txt
+skullcage5_i239.txt
+skullcage6_i239.txt
+skullcage7_i239.txt
+skullclamp.txt
+skullclamp2_i439.txt
+shepherd_of_rot.txt
+shivan_hellkite.txt
+shock.txt
+shock2.txt
+siege_gang_commander.txt
+simic_initiate.txt
+slate_of_ancestry.txt
+sleeper_agent.txt
+slith_bloodletter.txt
+sneak_attack.txt
+soulblast.txt
+spark_elemental.txt
+sphinx_summoner.txt
+spirit_link.txt
+spitting_earth.txt
+spoils_of_evil.txt
+spore_frog.txt
+stasis.txt
+steelclad_serpent1.txt
+steelclad_serpent2.txt
+stillmoon_cavalier.txt
+stonebrow2.txt
+stonebrow_i159.txt
+stronghold_discipline.txt
+sword_to_plowshares.txt
+sylvan_scrying_i195.txt
+symbiotic_wurm.txt
+tangle_golem.txt
+tanglesap.txt
+telekinetic_sliver.txt
+terror.txt
+terror2.txt
+thallid.txt
+thellon_of_havenwood.txt
+threaten.txt
+throne_of_bone.txt
+thunder-thrash_elder.txt
+titanic_ultimatum.txt
+tolsimir_wolfblood.txt
+torture.txt
+tranquil_domain.txt
+twinstrike.txt
+twinstrike2.txt
+twinstrike3.txt
+twitch.txt
+underworld_dreams.txt
+unearth1.txt
+unearth2.txt
+unearth3.txt
+unstable_mutation.txt
+unstable_mutation2.txt
+unwilling_recruit.txt
+urzas_lands.txt
+urzas_lands2.txt
+urzas_mine_i287.txt
+vampire_bats.txt
+vampiric_link.txt
+vine_dryad.txt
+volcanic_eruption.txt
+walking_wall.txt
+wall_of_diffusion.txt
+wall_of_diffusion2.txt
+warren_instigator.txt
+welkin_hawk.txt
+whispers_of_the_muse.txt
+white_knight1.txt
+windswept_heath.txt
+wrath_of_god.txt
+wrath_of_god2.txt
+wreak_havoc.txt
+Zombie_Infestation.txt
+zombie_master.txt
+zombify.txt
+########################
+#Momir Tests
+########################
+momir/keldon_warlord.txt
+momir/persist_i304.txt
+momir/overcost.txt
+########################
+#AI Tests
+########################
+#Removed until we can have these tests work on all machines :(
+#ai/goblin_artillery.txt