diff --git a/test/battle/ability/competitive.c b/test/battle/ability/competitive.c
new file mode 100644
index 0000000000..cc3e582eab
--- /dev/null
+++ b/test/battle/ability/competitive.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Competitive (Ability) test titles")
diff --git a/test/battle/ability/dark_aura.c b/test/battle/ability/dark_aura.c
new file mode 100644
index 0000000000..eb1bf05246
--- /dev/null
+++ b/test/battle/ability/dark_aura.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Dark Aura (Ability) test titles")
diff --git a/test/battle/ability/delta_stream.c b/test/battle/ability/delta_stream.c
new file mode 100644
index 0000000000..5b4081cb1e
--- /dev/null
+++ b/test/battle/ability/delta_stream.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Delta Stream (Ability) test titles")
diff --git a/test/battle/ability/early_bird.c b/test/battle/ability/early_bird.c
new file mode 100644
index 0000000000..9b368970f6
--- /dev/null
+++ b/test/battle/ability/early_bird.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Early Bird (Ability) test titles")
diff --git a/test/battle/ability/fairy_aura.c b/test/battle/ability/fairy_aura.c
new file mode 100644
index 0000000000..3b8d400b02
--- /dev/null
+++ b/test/battle/ability/fairy_aura.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Fairy Aura (Ability) test titles")
diff --git a/test/battle/ability/filter.c b/test/battle/ability/filter.c
new file mode 100644
index 0000000000..ca323b1be2
--- /dev/null
+++ b/test/battle/ability/filter.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Filter (Ability) test titles")
diff --git a/test/battle/ability/flare_boost.c b/test/battle/ability/flare_boost.c
new file mode 100644
index 0000000000..a4ff14382a
--- /dev/null
+++ b/test/battle/ability/flare_boost.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Flare Boost (Ability) test titles")
diff --git a/test/battle/ability/flower_veil.c b/test/battle/ability/flower_veil.c
new file mode 100644
index 0000000000..c1952360d1
--- /dev/null
+++ b/test/battle/ability/flower_veil.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Flower Veil (Ability) test titles")
diff --git a/test/battle/ability/forewarn.c b/test/battle/ability/forewarn.c
new file mode 100644
index 0000000000..810fcd975f
--- /dev/null
+++ b/test/battle/ability/forewarn.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Forewarn (Ability) test titles")
diff --git a/test/battle/ability/friend_guard.c b/test/battle/ability/friend_guard.c
new file mode 100644
index 0000000000..5e4776731e
--- /dev/null
+++ b/test/battle/ability/friend_guard.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Friend Guard (Ability) test titles")
diff --git a/test/battle/ability/fur_coat.c b/test/battle/ability/fur_coat.c
new file mode 100644
index 0000000000..56fb197114
--- /dev/null
+++ b/test/battle/ability/fur_coat.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Fur Coat (Ability) test titles")
diff --git a/test/battle/ability/gluttony.c b/test/battle/ability/gluttony.c
new file mode 100644
index 0000000000..4ceda945f6
--- /dev/null
+++ b/test/battle/ability/gluttony.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Gluttony (Ability) test titles")
diff --git a/test/battle/ability/gooey.c b/test/battle/ability/gooey.c
new file mode 100644
index 0000000000..ad78e30c39
--- /dev/null
+++ b/test/battle/ability/gooey.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Gooey (Ability) test titles")
diff --git a/test/battle/ability/gorilla_tactics.c b/test/battle/ability/gorilla_tactics.c
new file mode 100644
index 0000000000..2bafd88165
--- /dev/null
+++ b/test/battle/ability/gorilla_tactics.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Gorilla Tactics (Ability) test titles")
diff --git a/test/battle/ability/grass_pelt.c b/test/battle/ability/grass_pelt.c
new file mode 100644
index 0000000000..1696b71e10
--- /dev/null
+++ b/test/battle/ability/grass_pelt.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Grass Pelt (Ability) test titles")
diff --git a/test/battle/ability/guts.c b/test/battle/ability/guts.c
new file mode 100644
index 0000000000..459adc0e69
--- /dev/null
+++ b/test/battle/ability/guts.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Guts (Ability) test titles")
diff --git a/test/battle/ability/hadron_engine.c b/test/battle/ability/hadron_engine.c
new file mode 100644
index 0000000000..e6324c0c51
--- /dev/null
+++ b/test/battle/ability/hadron_engine.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Hadron Engine (Ability) test titles")
diff --git a/test/battle/ability/heatproof.c b/test/battle/ability/heatproof.c
new file mode 100644
index 0000000000..7f1d772bb7
--- /dev/null
+++ b/test/battle/ability/heatproof.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Heatproof (Ability) test titles")
diff --git a/test/battle/ability/heavy_metal.c b/test/battle/ability/heavy_metal.c
new file mode 100644
index 0000000000..baaa039b19
--- /dev/null
+++ b/test/battle/ability/heavy_metal.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Heavy Metal (Ability) test titles")
diff --git a/test/battle/ability/honey_gather.c b/test/battle/ability/honey_gather.c
new file mode 100644
index 0000000000..56dbb22f2e
--- /dev/null
+++ b/test/battle/ability/honey_gather.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Honey Gather (Ability) test titles")
diff --git a/test/battle/ability/huge_power.c b/test/battle/ability/huge_power.c
new file mode 100644
index 0000000000..9362bf8ce3
--- /dev/null
+++ b/test/battle/ability/huge_power.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Huge Power (Ability) test titles")
diff --git a/test/battle/ability/hustle.c b/test/battle/ability/hustle.c
new file mode 100644
index 0000000000..c399bfa501
--- /dev/null
+++ b/test/battle/ability/hustle.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Hustle (Ability) test titles")
diff --git a/test/battle/ability/illuminate.c b/test/battle/ability/illuminate.c
new file mode 100644
index 0000000000..72bf1f6f81
--- /dev/null
+++ b/test/battle/ability/illuminate.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Illuminate (Ability) test titles")
diff --git a/test/battle/ability/imposter.c b/test/battle/ability/imposter.c
new file mode 100644
index 0000000000..98f6cc29fc
--- /dev/null
+++ b/test/battle/ability/imposter.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Imposter (Ability) test titles")
diff --git a/test/battle/ability/infiltrator.c b/test/battle/ability/infiltrator.c
new file mode 100644
index 0000000000..faf00ee113
--- /dev/null
+++ b/test/battle/ability/infiltrator.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Infiltrator (Ability) test titles")
diff --git a/test/battle/ability/iron_barbs.c b/test/battle/ability/iron_barbs.c
new file mode 100644
index 0000000000..8b1525a9f6
--- /dev/null
+++ b/test/battle/ability/iron_barbs.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Iron Barbs (Ability) test titles")
diff --git a/test/battle/ability/iron_fist.c b/test/battle/ability/iron_fist.c
new file mode 100644
index 0000000000..ae26f9cdd0
--- /dev/null
+++ b/test/battle/ability/iron_fist.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Iron Fist (Ability) test titles")
diff --git a/test/battle/ability/justified.c b/test/battle/ability/justified.c
new file mode 100644
index 0000000000..3416d77415
--- /dev/null
+++ b/test/battle/ability/justified.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Justified (Ability) test titles")
diff --git a/test/battle/ability/klutz.c b/test/battle/ability/klutz.c
new file mode 100644
index 0000000000..76216edd17
--- /dev/null
+++ b/test/battle/ability/klutz.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Klutz (Ability) test titles")
diff --git a/test/battle/ability/levitate.c b/test/battle/ability/levitate.c
new file mode 100644
index 0000000000..a1c1dc927d
--- /dev/null
+++ b/test/battle/ability/levitate.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Levitate (Ability) test titles")
diff --git a/test/battle/ability/libero.c b/test/battle/ability/libero.c
new file mode 100644
index 0000000000..8ea93df3c0
--- /dev/null
+++ b/test/battle/ability/libero.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Libero (Ability) test titles")
diff --git a/test/battle/ability/light_metal.c b/test/battle/ability/light_metal.c
new file mode 100644
index 0000000000..8ad4a6a4b5
--- /dev/null
+++ b/test/battle/ability/light_metal.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Light Metal (Ability) test titles")
diff --git a/test/battle/ability/long_reach.c b/test/battle/ability/long_reach.c
new file mode 100644
index 0000000000..3558ea92b2
--- /dev/null
+++ b/test/battle/ability/long_reach.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Long Reach (Ability) test titles")
diff --git a/test/battle/ability/magma_armor.c b/test/battle/ability/magma_armor.c
new file mode 100644
index 0000000000..e61444baee
--- /dev/null
+++ b/test/battle/ability/magma_armor.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Magma Armor (Ability) test titles")
diff --git a/test/battle/ability/magnet_pull.c b/test/battle/ability/magnet_pull.c
new file mode 100644
index 0000000000..538b15f824
--- /dev/null
+++ b/test/battle/ability/magnet_pull.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Magnet Pull (Ability) test titles")
diff --git a/test/battle/ability/marvel_scale.c b/test/battle/ability/marvel_scale.c
new file mode 100644
index 0000000000..4fc7ee3c62
--- /dev/null
+++ b/test/battle/ability/marvel_scale.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Marvel Scale (Ability) test titles")
diff --git a/test/battle/ability/mega_launcher.c b/test/battle/ability/mega_launcher.c
new file mode 100644
index 0000000000..dae3799f81
--- /dev/null
+++ b/test/battle/ability/mega_launcher.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mega Launcher (Ability) test titles")
diff --git a/test/battle/ability/minus.c b/test/battle/ability/minus.c
new file mode 100644
index 0000000000..bf841465a6
--- /dev/null
+++ b/test/battle/ability/minus.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Minus (Ability) test titles")
diff --git a/test/battle/ability/mold_breaker.c b/test/battle/ability/mold_breaker.c
new file mode 100644
index 0000000000..2c04deeeef
--- /dev/null
+++ b/test/battle/ability/mold_breaker.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mold Breaker (Ability) test titles")
diff --git a/test/battle/ability/multiscale.c b/test/battle/ability/multiscale.c
new file mode 100644
index 0000000000..f2a808d69a
--- /dev/null
+++ b/test/battle/ability/multiscale.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Multiscale (Ability) test titles")
diff --git a/test/battle/ability/multitype.c b/test/battle/ability/multitype.c
new file mode 100644
index 0000000000..a8b384180f
--- /dev/null
+++ b/test/battle/ability/multitype.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Multitype (Ability) test titles")
diff --git a/test/battle/ability/natural_cure.c b/test/battle/ability/natural_cure.c
new file mode 100644
index 0000000000..760c341e12
--- /dev/null
+++ b/test/battle/ability/natural_cure.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Natural Cure (Ability) test titles")
diff --git a/test/battle/ability/no_guard.c b/test/battle/ability/no_guard.c
new file mode 100644
index 0000000000..e365968d45
--- /dev/null
+++ b/test/battle/ability/no_guard.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write No Guard (Ability) test titles")
diff --git a/test/battle/ability/perish_body.c b/test/battle/ability/perish_body.c
new file mode 100644
index 0000000000..92562ef885
--- /dev/null
+++ b/test/battle/ability/perish_body.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Perish Body (Ability) test titles")
diff --git a/test/battle/ability/pickpocket.c b/test/battle/ability/pickpocket.c
new file mode 100644
index 0000000000..1e8ec6a526
--- /dev/null
+++ b/test/battle/ability/pickpocket.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Pickpocket (Ability) test titles")
diff --git a/test/battle/ability/plus.c b/test/battle/ability/plus.c
new file mode 100644
index 0000000000..5b56018bf6
--- /dev/null
+++ b/test/battle/ability/plus.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Plus (Ability) test titles")
diff --git a/test/battle/ability/poison_puppeteer.c b/test/battle/ability/poison_puppeteer.c
index d5c470ad37..db27691415 100644
--- a/test/battle/ability/poison_puppeteer.c
+++ b/test/battle/ability/poison_puppeteer.c
@@ -1,10 +1,6 @@
 #include "global.h"
 #include "test/battle.h"
 
-ASSUMPTIONS
-{
-}
-
 SINGLE_BATTLE_TEST("Poison Puppeteer confuses target if it was poisoned by a damaging move")
 {
     GIVEN {
diff --git a/test/battle/ability/power_construct.c b/test/battle/ability/power_construct.c
new file mode 100644
index 0000000000..6a8ca9db5f
--- /dev/null
+++ b/test/battle/ability/power_construct.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Power Construct (Ability) test titles")
diff --git a/test/battle/ability/power_of_alchemy.c b/test/battle/ability/power_of_alchemy.c
new file mode 100644
index 0000000000..137a20a43d
--- /dev/null
+++ b/test/battle/ability/power_of_alchemy.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Power of Alchemy (Ability) test titles")
diff --git a/test/battle/ability/power_spot.c b/test/battle/ability/power_spot.c
new file mode 100644
index 0000000000..c44eb9a924
--- /dev/null
+++ b/test/battle/ability/power_spot.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Power Spot (Ability) test titles")
diff --git a/test/battle/ability/prism_armor.c b/test/battle/ability/prism_armor.c
new file mode 100644
index 0000000000..532642d3a2
--- /dev/null
+++ b/test/battle/ability/prism_armor.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Prism Armor (Ability) test titles")
diff --git a/test/battle/ability/propeller_tail.c b/test/battle/ability/propeller_tail.c
new file mode 100644
index 0000000000..eb8df38c8f
--- /dev/null
+++ b/test/battle/ability/propeller_tail.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Propeller Tail (Ability) test titles")
diff --git a/test/battle/ability/punk_rock.c b/test/battle/ability/punk_rock.c
new file mode 100644
index 0000000000..01a5459a0d
--- /dev/null
+++ b/test/battle/ability/punk_rock.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Punk Rock (Ability) test titles")
diff --git a/test/battle/ability/pure_power.c b/test/battle/ability/pure_power.c
new file mode 100644
index 0000000000..e33479252c
--- /dev/null
+++ b/test/battle/ability/pure_power.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Pure Power (Ability) test titles")
diff --git a/test/battle/ability/quick_feet.c b/test/battle/ability/quick_feet.c
new file mode 100644
index 0000000000..fde10a7593
--- /dev/null
+++ b/test/battle/ability/quick_feet.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Quick Feet (Ability) test titles")
diff --git a/test/battle/ability/receiver.c b/test/battle/ability/receiver.c
new file mode 100644
index 0000000000..a9155b7244
--- /dev/null
+++ b/test/battle/ability/receiver.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Receiver (Ability) test titles")
diff --git a/test/battle/ability/reckless.c b/test/battle/ability/reckless.c
new file mode 100644
index 0000000000..49d5c59262
--- /dev/null
+++ b/test/battle/ability/reckless.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Reckless (Ability) test titles")
diff --git a/test/battle/ability/rks_system.c b/test/battle/ability/rks_system.c
new file mode 100644
index 0000000000..17c4d2d4a7
--- /dev/null
+++ b/test/battle/ability/rks_system.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write RKS System (Ability) test titles")
diff --git a/test/battle/ability/rock_head.c b/test/battle/ability/rock_head.c
new file mode 100644
index 0000000000..56db705778
--- /dev/null
+++ b/test/battle/ability/rock_head.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Rock Head (Ability) test titles")
diff --git a/test/battle/ability/run_away.c b/test/battle/ability/run_away.c
new file mode 100644
index 0000000000..c49eef7213
--- /dev/null
+++ b/test/battle/ability/run_away.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Run Away (Ability) test titles")
diff --git a/test/battle/ability/sand_spit.c b/test/battle/ability/sand_spit.c
new file mode 100644
index 0000000000..c2128f65de
--- /dev/null
+++ b/test/battle/ability/sand_spit.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sand Spit (Ability) test titles")
diff --git a/test/battle/ability/sand_stream.c b/test/battle/ability/sand_stream.c
new file mode 100644
index 0000000000..6cd1b06eb4
--- /dev/null
+++ b/test/battle/ability/sand_stream.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sand Stream (Ability) test titles")
diff --git a/test/battle/ability/screen_cleaner.c b/test/battle/ability/screen_cleaner.c
new file mode 100644
index 0000000000..dd4ad761d1
--- /dev/null
+++ b/test/battle/ability/screen_cleaner.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Screen Cleaner (Ability) test titles")
diff --git a/test/battle/ability/serene_grace.c b/test/battle/ability/serene_grace.c
new file mode 100644
index 0000000000..75dad60618
--- /dev/null
+++ b/test/battle/ability/serene_grace.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Serene Grace (Ability) test titles")
diff --git a/test/battle/ability/shadow_shield.c b/test/battle/ability/shadow_shield.c
new file mode 100644
index 0000000000..7a28500761
--- /dev/null
+++ b/test/battle/ability/shadow_shield.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Shadow Shield (Ability) test titles")
diff --git a/test/battle/ability/shadow_tag.c b/test/battle/ability/shadow_tag.c
new file mode 100644
index 0000000000..f00696d8b7
--- /dev/null
+++ b/test/battle/ability/shadow_tag.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Shadow Tag (Ability) test titles")
diff --git a/test/battle/ability/simple.c b/test/battle/ability/simple.c
new file mode 100644
index 0000000000..cfdbf407ea
--- /dev/null
+++ b/test/battle/ability/simple.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Simple (Ability) test titles")
diff --git a/test/battle/ability/skill_link.c b/test/battle/ability/skill_link.c
new file mode 100644
index 0000000000..2da8ee2c58
--- /dev/null
+++ b/test/battle/ability/skill_link.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Skill Link (Ability) test titles")
diff --git a/test/battle/ability/slow_start.c b/test/battle/ability/slow_start.c
new file mode 100644
index 0000000000..d5b3f5bcb5
--- /dev/null
+++ b/test/battle/ability/slow_start.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Slow Start (Ability) test titles")
diff --git a/test/battle/ability/soul_heart.c b/test/battle/ability/soul_heart.c
new file mode 100644
index 0000000000..393fbb6c20
--- /dev/null
+++ b/test/battle/ability/soul_heart.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Soul Heart (Ability) test titles")
diff --git a/test/battle/ability/soundproof.c b/test/battle/ability/soundproof.c
new file mode 100644
index 0000000000..a7135942d1
--- /dev/null
+++ b/test/battle/ability/soundproof.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Soundproof (Ability) test titles")
diff --git a/test/battle/ability/stakeout.c b/test/battle/ability/stakeout.c
new file mode 100644
index 0000000000..2bbea394fd
--- /dev/null
+++ b/test/battle/ability/stakeout.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Stakeout (Ability) test titles")
diff --git a/test/battle/ability/stall.c b/test/battle/ability/stall.c
new file mode 100644
index 0000000000..f93eac14c4
--- /dev/null
+++ b/test/battle/ability/stall.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Stall (Ability) test titles")
diff --git a/test/battle/ability/steadfast.c b/test/battle/ability/steadfast.c
new file mode 100644
index 0000000000..fc35e94278
--- /dev/null
+++ b/test/battle/ability/steadfast.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Steadfast (Ability) test titles")
diff --git a/test/battle/ability/steely_spirit.c b/test/battle/ability/steely_spirit.c
new file mode 100644
index 0000000000..e84893ad8c
--- /dev/null
+++ b/test/battle/ability/steely_spirit.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Steely Spirit (Ability) test titles")
diff --git a/test/battle/ability/strong_jaw.c b/test/battle/ability/strong_jaw.c
new file mode 100644
index 0000000000..1b9ce7fba7
--- /dev/null
+++ b/test/battle/ability/strong_jaw.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Strong Jaw (Ability) test titles")
diff --git a/test/battle/ability/suction_cups.c b/test/battle/ability/suction_cups.c
new file mode 100644
index 0000000000..bcf23c5e18
--- /dev/null
+++ b/test/battle/ability/suction_cups.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Suction Cups (Ability) test titles")
diff --git a/test/battle/ability/surge_surfer.c b/test/battle/ability/surge_surfer.c
new file mode 100644
index 0000000000..c0b1056a2d
--- /dev/null
+++ b/test/battle/ability/surge_surfer.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Surge Surfer (Ability) test titles")
diff --git a/test/battle/ability/sweet_veil.c b/test/battle/ability/sweet_veil.c
new file mode 100644
index 0000000000..2cedae3c14
--- /dev/null
+++ b/test/battle/ability/sweet_veil.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sweet Veil (Ability) test titles")
diff --git a/test/battle/ability/synchronize.c b/test/battle/ability/synchronize.c
new file mode 100644
index 0000000000..43cf87d5fe
--- /dev/null
+++ b/test/battle/ability/synchronize.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Synchronize (Ability) test titles")
diff --git a/test/battle/ability/tangled_feet.c b/test/battle/ability/tangled_feet.c
new file mode 100644
index 0000000000..fb50ba191d
--- /dev/null
+++ b/test/battle/ability/tangled_feet.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Tangled Feet (Ability) test titles")
diff --git a/test/battle/ability/technician.c b/test/battle/ability/technician.c
new file mode 100644
index 0000000000..bd529a5a01
--- /dev/null
+++ b/test/battle/ability/technician.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Technician (Ability) test titles")
diff --git a/test/battle/ability/telepathy.c b/test/battle/ability/telepathy.c
new file mode 100644
index 0000000000..220b2e7180
--- /dev/null
+++ b/test/battle/ability/telepathy.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Telepathy (Ability) test titles")
diff --git a/test/battle/ability/teravolt.c b/test/battle/ability/teravolt.c
new file mode 100644
index 0000000000..e9739a720d
--- /dev/null
+++ b/test/battle/ability/teravolt.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Teravolt (Ability) test titles")
diff --git a/test/battle/ability/thick_fat.c b/test/battle/ability/thick_fat.c
new file mode 100644
index 0000000000..bcc4c9487c
--- /dev/null
+++ b/test/battle/ability/thick_fat.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Thick Fat (Ability) test titles")
diff --git a/test/battle/ability/tinted_lens.c b/test/battle/ability/tinted_lens.c
new file mode 100644
index 0000000000..9ddb69ec17
--- /dev/null
+++ b/test/battle/ability/tinted_lens.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Tinted Lens (Ability) test titles")
diff --git a/test/battle/ability/tough_claws.c b/test/battle/ability/tough_claws.c
new file mode 100644
index 0000000000..4e6f4ecf8b
--- /dev/null
+++ b/test/battle/ability/tough_claws.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Tough Claws (Ability) test titles")
diff --git a/test/battle/ability/toxic_boost.c b/test/battle/ability/toxic_boost.c
new file mode 100644
index 0000000000..85960c5b02
--- /dev/null
+++ b/test/battle/ability/toxic_boost.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Toxic Boost (Ability) test titles")
diff --git a/test/battle/ability/triage.c b/test/battle/ability/triage.c
new file mode 100644
index 0000000000..753d32b717
--- /dev/null
+++ b/test/battle/ability/triage.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Triage (Ability) test titles")
diff --git a/test/battle/ability/truant.c b/test/battle/ability/truant.c
new file mode 100644
index 0000000000..85c0fe7749
--- /dev/null
+++ b/test/battle/ability/truant.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Truant (Ability) test titles")
diff --git a/test/battle/ability/turboblaze.c b/test/battle/ability/turboblaze.c
new file mode 100644
index 0000000000..a715c23111
--- /dev/null
+++ b/test/battle/ability/turboblaze.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Turboblaze (Ability) test titles")
diff --git a/test/battle/ability/unaware.c b/test/battle/ability/unaware.c
new file mode 100644
index 0000000000..5eb83cb9df
--- /dev/null
+++ b/test/battle/ability/unaware.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Unaware (Ability) test titles")
diff --git a/test/battle/ability/unseen_fist.c b/test/battle/ability/unseen_fist.c
new file mode 100644
index 0000000000..046ef7d2fb
--- /dev/null
+++ b/test/battle/ability/unseen_fist.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Unseen Fist (Ability) test titles")
diff --git a/test/battle/ability/victory_star.c b/test/battle/ability/victory_star.c
new file mode 100644
index 0000000000..46c3aca825
--- /dev/null
+++ b/test/battle/ability/victory_star.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Victory Star (Ability) test titles")
diff --git a/test/battle/ability/vital_spirit.c b/test/battle/ability/vital_spirit.c
new file mode 100644
index 0000000000..2539df2334
--- /dev/null
+++ b/test/battle/ability/vital_spirit.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Vital Spirit (Ability) test titles")
diff --git a/test/battle/ability/wandering_spirit.c b/test/battle/ability/wandering_spirit.c
new file mode 100644
index 0000000000..d32fb7c7b2
--- /dev/null
+++ b/test/battle/ability/wandering_spirit.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Wandering Spirit (Ability) test titles")
diff --git a/test/battle/ability/water_bubble.c b/test/battle/ability/water_bubble.c
new file mode 100644
index 0000000000..2f04b18096
--- /dev/null
+++ b/test/battle/ability/water_bubble.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Water Bubble (Ability) test titles")
diff --git a/test/battle/ability/water_veil.c b/test/battle/ability/water_veil.c
new file mode 100644
index 0000000000..428243fc10
--- /dev/null
+++ b/test/battle/ability/water_veil.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Water Veil (Ability) test titles")
diff --git a/test/battle/ability/well_baked_body.c b/test/battle/ability/well_baked_body.c
new file mode 100644
index 0000000000..ae555b47cf
--- /dev/null
+++ b/test/battle/ability/well_baked_body.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Well-Baked Body (Ability) test titles")
diff --git a/test/battle/ability/wimp_out.c b/test/battle/ability/wimp_out.c
new file mode 100644
index 0000000000..3ceea91788
--- /dev/null
+++ b/test/battle/ability/wimp_out.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Wimp Out (Ability) test titles")
diff --git a/test/battle/ability/wonder_guard.c b/test/battle/ability/wonder_guard.c
new file mode 100644
index 0000000000..673b6c113a
--- /dev/null
+++ b/test/battle/ability/wonder_guard.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Wonder Guard (Ability) test titles")
diff --git a/test/battle/ability/wonder_skin.c b/test/battle/ability/wonder_skin.c
new file mode 100644
index 0000000000..6501894f1c
--- /dev/null
+++ b/test/battle/ability/wonder_skin.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Wonder Skin (Ability) test titles")
diff --git a/test/battle/move_effect/facade.c b/test/battle/move_effect/facade.c
new file mode 100644
index 0000000000..cc1e21e34f
--- /dev/null
+++ b/test/battle/move_effect/facade.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Facade (Move Effect) test titles")
diff --git a/test/battle/move_effect/fairy_lock.c b/test/battle/move_effect/fairy_lock.c
new file mode 100644
index 0000000000..a42aa6aa48
--- /dev/null
+++ b/test/battle/move_effect/fairy_lock.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Fairy Lock (Move Effect) test titles")
diff --git a/test/battle/move_effect/false_swipe.c b/test/battle/move_effect/false_swipe.c
new file mode 100644
index 0000000000..da2cbf6a21
--- /dev/null
+++ b/test/battle/move_effect/false_swipe.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write False Swipe (Move Effect) test titles")
diff --git a/test/battle/move_effect/fell_stinger.c b/test/battle/move_effect/fell_stinger.c
new file mode 100644
index 0000000000..2613dc2d9d
--- /dev/null
+++ b/test/battle/move_effect/fell_stinger.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Fell Stinger (Move Effect) test titles")
diff --git a/test/battle/move_effect/final_gambit.c b/test/battle/move_effect/final_gambit.c
new file mode 100644
index 0000000000..be815abf5a
--- /dev/null
+++ b/test/battle/move_effect/final_gambit.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Final Gambit (Move Effect) test titles")
diff --git a/test/battle/move_effect/first_turn_only.c b/test/battle/move_effect/first_turn_only.c
new file mode 100644
index 0000000000..b26245a3d9
--- /dev/null
+++ b/test/battle/move_effect/first_turn_only.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Fake Out/First Impression (Move Effect) test titles")
diff --git a/test/battle/move_effect/flail.c b/test/battle/move_effect/flail.c
new file mode 100644
index 0000000000..af5544d9b4
--- /dev/null
+++ b/test/battle/move_effect/flail.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Flail (Move Effect) test titles")
diff --git a/test/battle/move_effect/flatter.c b/test/battle/move_effect/flatter.c
new file mode 100644
index 0000000000..7effb09329
--- /dev/null
+++ b/test/battle/move_effect/flatter.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Flatter (Move Effect) test titles")
diff --git a/test/battle/move_effect/foresight.c b/test/battle/move_effect/foresight.c
new file mode 100644
index 0000000000..082e2d6fa4
--- /dev/null
+++ b/test/battle/move_effect/foresight.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Foresight (Move Effect) test titles")
diff --git a/test/battle/move_effect/frustration.c b/test/battle/move_effect/frustration.c
new file mode 100644
index 0000000000..eb994c5076
--- /dev/null
+++ b/test/battle/move_effect/frustration.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Frustration (Move Effect) test titles")
diff --git a/test/battle/move_effect/fusion_combo.c b/test/battle/move_effect/fusion_combo.c
new file mode 100644
index 0000000000..7561536b11
--- /dev/null
+++ b/test/battle/move_effect/fusion_combo.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Fusion Flare/Bolt (Move Effect) test titles")
diff --git a/test/battle/move_effect/gear_up.c b/test/battle/move_effect/gear_up.c
new file mode 100644
index 0000000000..03aba9a395
--- /dev/null
+++ b/test/battle/move_effect/gear_up.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Gear Up (Move Effect) test titles")
diff --git a/test/battle/move_effect/geomancy.c b/test/battle/move_effect/geomancy.c
new file mode 100644
index 0000000000..f5b113a452
--- /dev/null
+++ b/test/battle/move_effect/geomancy.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Geomancy (Move Effect) test titles")
diff --git a/test/battle/move_effect/grassy_glide.c b/test/battle/move_effect/grassy_glide.c
new file mode 100644
index 0000000000..00219fb1dd
--- /dev/null
+++ b/test/battle/move_effect/grassy_glide.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Grassy Glide (Move Effect) test titles")
diff --git a/test/battle/move_effect/grav_apple.c b/test/battle/move_effect/grav_apple.c
new file mode 100644
index 0000000000..7ce2dd26c7
--- /dev/null
+++ b/test/battle/move_effect/grav_apple.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Grav Apple (Move Effect) test titles")
diff --git a/test/battle/move_effect/growth.c b/test/battle/move_effect/growth.c
new file mode 100644
index 0000000000..7b53f56cfc
--- /dev/null
+++ b/test/battle/move_effect/growth.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Growth (Move Effect) test titles")
diff --git a/test/battle/move_effect/grudge.c b/test/battle/move_effect/grudge.c
new file mode 100644
index 0000000000..f0e0e53b6a
--- /dev/null
+++ b/test/battle/move_effect/grudge.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Grudge (Move Effect) test titles")
diff --git a/test/battle/move_effect/guard_swap.c b/test/battle/move_effect/guard_swap.c
new file mode 100644
index 0000000000..f0e0e53b6a
--- /dev/null
+++ b/test/battle/move_effect/guard_swap.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Grudge (Move Effect) test titles")
diff --git a/test/battle/move_effect/guardian_of_alola.c b/test/battle/move_effect/guardian_of_alola.c
new file mode 100644
index 0000000000..fe33236363
--- /dev/null
+++ b/test/battle/move_effect/guardian_of_alola.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Guardian of Alola (Move Effect) test titles")
diff --git a/test/battle/move_effect/gyro_ball.c b/test/battle/move_effect/gyro_ball.c
new file mode 100644
index 0000000000..e6cbfa46c9
--- /dev/null
+++ b/test/battle/move_effect/gyro_ball.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Gyro Ball (Move Effect) test titles")
diff --git a/test/battle/move_effect/hail.c b/test/battle/move_effect/hail.c
new file mode 100644
index 0000000000..9fdbe0ab37
--- /dev/null
+++ b/test/battle/move_effect/hail.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Hail (Move Effect) test titles")
diff --git a/test/battle/move_effect/happy_hour.c b/test/battle/move_effect/happy_hour.c
new file mode 100644
index 0000000000..4e271068e2
--- /dev/null
+++ b/test/battle/move_effect/happy_hour.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Happy Hour (Move Effect) test titles")
diff --git a/test/battle/move_effect/heal_block.c b/test/battle/move_effect/heal_block.c
new file mode 100644
index 0000000000..2bb4367dd4
--- /dev/null
+++ b/test/battle/move_effect/heal_block.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Heal Block (Move Effect) test titles")
diff --git a/test/battle/move_effect/heart_swap.c b/test/battle/move_effect/heart_swap.c
new file mode 100644
index 0000000000..1c4d22e204
--- /dev/null
+++ b/test/battle/move_effect/heart_swap.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Heart Swap (Move Effect) test titles")
diff --git a/test/battle/move_effect/heat_crash.c b/test/battle/move_effect/heat_crash.c
new file mode 100644
index 0000000000..8b2d0a0433
--- /dev/null
+++ b/test/battle/move_effect/heat_crash.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Heat Crash (Move Effect) test titles")
diff --git a/test/battle/move_effect/helping_hand.c b/test/battle/move_effect/helping_hand.c
new file mode 100644
index 0000000000..81d64e113d
--- /dev/null
+++ b/test/battle/move_effect/helping_hand.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Helping Hand (Move Effect) test titles")
diff --git a/test/battle/move_effect/hit_enemy_heal_ally.c b/test/battle/move_effect/hit_enemy_heal_ally.c
new file mode 100644
index 0000000000..018672cd6c
--- /dev/null
+++ b/test/battle/move_effect/hit_enemy_heal_ally.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Pollen Puff (Move Effect) test titles")
diff --git a/test/battle/move_effect/hyperspace_fury.c b/test/battle/move_effect/hyperspace_fury.c
new file mode 100644
index 0000000000..080758c94b
--- /dev/null
+++ b/test/battle/move_effect/hyperspace_fury.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Hyperspace Fury (Move Effect) test titles")
diff --git a/test/battle/move_effect/imprison.c b/test/battle/move_effect/imprison.c
new file mode 100644
index 0000000000..dd4e496692
--- /dev/null
+++ b/test/battle/move_effect/imprison.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Imprison (Move Effect) test titles")
diff --git a/test/battle/move_effect/ingrain.c b/test/battle/move_effect/ingrain.c
new file mode 100644
index 0000000000..19213f10d9
--- /dev/null
+++ b/test/battle/move_effect/ingrain.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Ingrain (Move Effect) test titles")
diff --git a/test/battle/move_effect/jungle_healing.c b/test/battle/move_effect/jungle_healing.c
new file mode 100644
index 0000000000..12b964a049
--- /dev/null
+++ b/test/battle/move_effect/jungle_healing.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Jungle Healing (Move Effect) test titles")
diff --git a/test/battle/move_effect/lash_out.c b/test/battle/move_effect/lash_out.c
new file mode 100644
index 0000000000..dd8e9eb0e9
--- /dev/null
+++ b/test/battle/move_effect/lash_out.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Lash Out (Move Effect) test titles")
diff --git a/test/battle/move_effect/level_damage.c b/test/battle/move_effect/level_damage.c
new file mode 100644
index 0000000000..63bd121577
--- /dev/null
+++ b/test/battle/move_effect/level_damage.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Seismic Toss/Night Shade (Move Effect) test titles")
diff --git a/test/battle/move_effect/light_screen.c b/test/battle/move_effect/light_screen.c
new file mode 100644
index 0000000000..56eedebbd4
--- /dev/null
+++ b/test/battle/move_effect/light_screen.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Light Screen (Move Effect) test titles")
diff --git a/test/battle/move_effect/lock_on.c b/test/battle/move_effect/lock_on.c
new file mode 100644
index 0000000000..9e7b93cff4
--- /dev/null
+++ b/test/battle/move_effect/lock_on.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Lock-On/Mind Reader (Move Effect) test titles")
diff --git a/test/battle/move_effect/low_kick.c b/test/battle/move_effect/low_kick.c
new file mode 100644
index 0000000000..c68b152e2d
--- /dev/null
+++ b/test/battle/move_effect/low_kick.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Low Kick (Move Effect) test titles")
diff --git a/test/battle/move_effect/magic_room.c b/test/battle/move_effect/magic_room.c
new file mode 100644
index 0000000000..9fde0046fd
--- /dev/null
+++ b/test/battle/move_effect/magic_room.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Magic Room (Move Effect) test titles")
diff --git a/test/battle/move_effect/magnet_rise.c b/test/battle/move_effect/magnet_rise.c
new file mode 100644
index 0000000000..9fde0046fd
--- /dev/null
+++ b/test/battle/move_effect/magnet_rise.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Magic Room (Move Effect) test titles")
diff --git a/test/battle/move_effect/magnetic_flux.c b/test/battle/move_effect/magnetic_flux.c
new file mode 100644
index 0000000000..f574db0089
--- /dev/null
+++ b/test/battle/move_effect/magnetic_flux.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Magnetic Flux (Move Effect) test titles")
diff --git a/test/battle/move_effect/magnitude.c b/test/battle/move_effect/magnitude.c
new file mode 100644
index 0000000000..75799a4dcb
--- /dev/null
+++ b/test/battle/move_effect/magnitude.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Magnitude (Move Effect) test titles")
diff --git a/test/battle/move_effect/mat_block.c b/test/battle/move_effect/mat_block.c
new file mode 100644
index 0000000000..78921a7329
--- /dev/null
+++ b/test/battle/move_effect/mat_block.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mat Block (Move Effect) test titles")
diff --git a/test/battle/move_effect/max_move.c b/test/battle/move_effect/max_move.c
new file mode 100644
index 0000000000..41c2a4e32c
--- /dev/null
+++ b/test/battle/move_effect/max_move.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Max Moves (Move Effect) test titles")
diff --git a/test/battle/move_effect/me_first.c b/test/battle/move_effect/me_first.c
new file mode 100644
index 0000000000..e5fbd2a7fb
--- /dev/null
+++ b/test/battle/move_effect/me_first.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Me First (Move Effect) test titles")
diff --git a/test/battle/move_effect/mean_look.c b/test/battle/move_effect/mean_look.c
new file mode 100644
index 0000000000..a5fa8ff0c1
--- /dev/null
+++ b/test/battle/move_effect/mean_look.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mean Look (Move Effect) test titles")
diff --git a/test/battle/move_effect/memento.c b/test/battle/move_effect/memento.c
new file mode 100644
index 0000000000..c83ffc1ab1
--- /dev/null
+++ b/test/battle/move_effect/memento.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Memento (Move Effect) test titles")
diff --git a/test/battle/move_effect/metal_burst.c b/test/battle/move_effect/metal_burst.c
new file mode 100644
index 0000000000..4fec370e85
--- /dev/null
+++ b/test/battle/move_effect/metal_burst.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Metal Burst (Move Effect) test titles")
diff --git a/test/battle/move_effect/mimic.c b/test/battle/move_effect/mimic.c
new file mode 100644
index 0000000000..4a51a4b79e
--- /dev/null
+++ b/test/battle/move_effect/mimic.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mimic (Move Effect) test titles")
diff --git a/test/battle/move_effect/minimize.c b/test/battle/move_effect/minimize.c
new file mode 100644
index 0000000000..f0196936a5
--- /dev/null
+++ b/test/battle/move_effect/minimize.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Minimize (Move Effect) test titles")
diff --git a/test/battle/move_effect/miracle_eye.c b/test/battle/move_effect/miracle_eye.c
new file mode 100644
index 0000000000..784323f1cc
--- /dev/null
+++ b/test/battle/move_effect/miracle_eye.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Miracle Eye (Move Effect) test titles")
diff --git a/test/battle/move_effect/mirror_coat.c b/test/battle/move_effect/mirror_coat.c
new file mode 100644
index 0000000000..2a3d6ef250
--- /dev/null
+++ b/test/battle/move_effect/mirror_coat.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mirror Coat (Move Effect) test titles")
diff --git a/test/battle/move_effect/mist.c b/test/battle/move_effect/mist.c
new file mode 100644
index 0000000000..332d82a6f9
--- /dev/null
+++ b/test/battle/move_effect/mist.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mist (Move Effect) test titles")
diff --git a/test/battle/move_effect/mud_sport.c b/test/battle/move_effect/mud_sport.c
new file mode 100644
index 0000000000..143bbe1447
--- /dev/null
+++ b/test/battle/move_effect/mud_sport.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Mud Sport (Move Effect) test titles")
diff --git a/test/battle/move_effect/natural_gift.c b/test/battle/move_effect/natural_gift.c
new file mode 100644
index 0000000000..dd9b0bd466
--- /dev/null
+++ b/test/battle/move_effect/natural_gift.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Natural Gift (Move Effect) test titles")
diff --git a/test/battle/move_effect/nature_power.c b/test/battle/move_effect/nature_power.c
new file mode 100644
index 0000000000..1e9692f88d
--- /dev/null
+++ b/test/battle/move_effect/nature_power.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Nature Power (Move Effect) test titles")
diff --git a/test/battle/move_effect/nightmare.c b/test/battle/move_effect/nightmare.c
new file mode 100644
index 0000000000..c243664f2d
--- /dev/null
+++ b/test/battle/move_effect/nightmare.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Nightmare (Move Effect) test titles")
diff --git a/test/battle/move_effect/no_retreat.c b/test/battle/move_effect/no_retreat.c
new file mode 100644
index 0000000000..bf2a15dfbf
--- /dev/null
+++ b/test/battle/move_effect/no_retreat.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write No Retreat (Move Effect) test titles")
diff --git a/test/battle/move_effect/noble_roar.c b/test/battle/move_effect/noble_roar.c
new file mode 100644
index 0000000000..4fd182b84d
--- /dev/null
+++ b/test/battle/move_effect/noble_roar.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Noble Roar (Move Effect) test titles")
diff --git a/test/battle/move_effect/order_up.c b/test/battle/move_effect/order_up.c
new file mode 100644
index 0000000000..fffd773403
--- /dev/null
+++ b/test/battle/move_effect/order_up.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Order Up (Move Effect) test titles")
diff --git a/test/battle/move_effect/pain_split.c b/test/battle/move_effect/pain_split.c
new file mode 100644
index 0000000000..be92aecc7d
--- /dev/null
+++ b/test/battle/move_effect/pain_split.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Pain Split (Move Effect) test titles")
diff --git a/test/battle/move_effect/paralyze.c b/test/battle/move_effect/paralyze.c
new file mode 100644
index 0000000000..a3f1a5574a
--- /dev/null
+++ b/test/battle/move_effect/paralyze.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Paralyze (Move Effect) test titles")
diff --git a/test/battle/move_effect/parting_shot.c b/test/battle/move_effect/parting_shot.c
new file mode 100644
index 0000000000..4d55d09315
--- /dev/null
+++ b/test/battle/move_effect/parting_shot.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Parting Shot (Move Effect) test titles")
diff --git a/test/battle/move_effect/payback.c b/test/battle/move_effect/payback.c
new file mode 100644
index 0000000000..1f078987a1
--- /dev/null
+++ b/test/battle/move_effect/payback.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Payback (Move Effect) test titles")
diff --git a/test/battle/move_effect/perish_song.c b/test/battle/move_effect/perish_song.c
new file mode 100644
index 0000000000..bfbe7eedc8
--- /dev/null
+++ b/test/battle/move_effect/perish_song.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Perish Song (Move Effect) test titles")
diff --git a/test/battle/move_effect/placeholder.c b/test/battle/move_effect/placeholder.c
new file mode 100644
index 0000000000..1b06392b9a
--- /dev/null
+++ b/test/battle/move_effect/placeholder.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Placeholder (Move Effect) test titles")
diff --git a/test/battle/move_effect/poison.c b/test/battle/move_effect/poison.c
new file mode 100644
index 0000000000..5b26ccf62d
--- /dev/null
+++ b/test/battle/move_effect/poison.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Poison (Move Effect) test titles")
diff --git a/test/battle/move_effect/poltergeist.c b/test/battle/move_effect/poltergeist.c
new file mode 100644
index 0000000000..f90031d8a8
--- /dev/null
+++ b/test/battle/move_effect/poltergeist.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Poltergeist (Move Effect) test titles")
diff --git a/test/battle/move_effect/power_swap.c b/test/battle/move_effect/power_swap.c
new file mode 100644
index 0000000000..214a8488cc
--- /dev/null
+++ b/test/battle/move_effect/power_swap.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Power Swap (Move Effect) test titles")
diff --git a/test/battle/move_effect/power_trick.c b/test/battle/move_effect/power_trick.c
new file mode 100644
index 0000000000..a8f89051e7
--- /dev/null
+++ b/test/battle/move_effect/power_trick.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Power Trick (Move Effect) test titles")
diff --git a/test/battle/move_effect/present.c b/test/battle/move_effect/present.c
new file mode 100644
index 0000000000..bd21f13de4
--- /dev/null
+++ b/test/battle/move_effect/present.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Present (Move Effect) test titles")
diff --git a/test/battle/move_effect/psyblade.c b/test/battle/move_effect/psyblade.c
new file mode 100644
index 0000000000..3a5778d1f4
--- /dev/null
+++ b/test/battle/move_effect/psyblade.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Psyblade (Move Effect) test titles")
diff --git a/test/battle/move_effect/psych_up.c b/test/battle/move_effect/psych_up.c
new file mode 100644
index 0000000000..36241a4ed7
--- /dev/null
+++ b/test/battle/move_effect/psych_up.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Psych Up (Move Effect) test titles")
diff --git a/test/battle/move_effect/psycho_shift.c b/test/battle/move_effect/psycho_shift.c
new file mode 100644
index 0000000000..4382ca4575
--- /dev/null
+++ b/test/battle/move_effect/psycho_shift.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Psycho Shift (Move Effect) test titles")
diff --git a/test/battle/move_effect/psyshock.c b/test/battle/move_effect/psyshock.c
new file mode 100644
index 0000000000..6b3ee54c5c
--- /dev/null
+++ b/test/battle/move_effect/psyshock.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Psyshock (Move Effect) test titles")
diff --git a/test/battle/move_effect/psywave.c b/test/battle/move_effect/psywave.c
new file mode 100644
index 0000000000..627e45ea3e
--- /dev/null
+++ b/test/battle/move_effect/psywave.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Psywave (Move Effect) test titles")
diff --git a/test/battle/move_effect/punishment.c b/test/battle/move_effect/punishment.c
new file mode 100644
index 0000000000..45f0b899af
--- /dev/null
+++ b/test/battle/move_effect/punishment.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Punishment (Move Effect) test titles")
diff --git a/test/battle/move_effect/purify.c b/test/battle/move_effect/purify.c
new file mode 100644
index 0000000000..134c96119f
--- /dev/null
+++ b/test/battle/move_effect/purify.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Purify (Move Effect) test titles")
diff --git a/test/battle/move_effect/quiver_dance.c b/test/battle/move_effect/quiver_dance.c
new file mode 100644
index 0000000000..5a7ff5b944
--- /dev/null
+++ b/test/battle/move_effect/quiver_dance.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Quiver Dance (Move Effect) test titles")
diff --git a/test/battle/move_effect/rage.c b/test/battle/move_effect/rage.c
new file mode 100644
index 0000000000..33025a6b0e
--- /dev/null
+++ b/test/battle/move_effect/rage.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Rage (Move Effect) test titles")
diff --git a/test/battle/move_effect/rain_always_hit.c b/test/battle/move_effect/rain_always_hit.c
new file mode 100644
index 0000000000..3bed952a37
--- /dev/null
+++ b/test/battle/move_effect/rain_always_hit.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Bleakwind/Wildbolt/Sandsear Storm (Move Effect) test titles")
diff --git a/test/battle/move_effect/rain_dance.c b/test/battle/move_effect/rain_dance.c
new file mode 100644
index 0000000000..f9c3786b71
--- /dev/null
+++ b/test/battle/move_effect/rain_dance.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Rain Dance (Move Effect) test titles")
diff --git a/test/battle/move_effect/recoil_hp_25.c b/test/battle/move_effect/recoil_hp_25.c
new file mode 100644
index 0000000000..9abb1bcfd0
--- /dev/null
+++ b/test/battle/move_effect/recoil_hp_25.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Struggle (Move Effect) test titles")
diff --git a/test/battle/move_effect/recycle.c b/test/battle/move_effect/recycle.c
new file mode 100644
index 0000000000..53f2e5c2ff
--- /dev/null
+++ b/test/battle/move_effect/recycle.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Recycle (Move Effect) test titles")
diff --git a/test/battle/move_effect/rest.c b/test/battle/move_effect/rest.c
new file mode 100644
index 0000000000..4d0d85b560
--- /dev/null
+++ b/test/battle/move_effect/rest.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Rest (Move Effect) test titles")
diff --git a/test/battle/move_effect/restore_hp.c b/test/battle/move_effect/restore_hp.c
new file mode 100644
index 0000000000..57f756115e
--- /dev/null
+++ b/test/battle/move_effect/restore_hp.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Recover/Slack Off/Heal Order (Move Effect) test titles")
diff --git a/test/battle/move_effect/return.c b/test/battle/move_effect/return.c
new file mode 100644
index 0000000000..50945ca556
--- /dev/null
+++ b/test/battle/move_effect/return.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Return (Move Effect) test titles")
diff --git a/test/battle/move_effect/revenge.c b/test/battle/move_effect/revenge.c
new file mode 100644
index 0000000000..980bca9e33
--- /dev/null
+++ b/test/battle/move_effect/revenge.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Revenge (Move Effect) test titles")
diff --git a/test/battle/move_effect/rising_voltage.c b/test/battle/move_effect/rising_voltage.c
new file mode 100644
index 0000000000..de6ca67c04
--- /dev/null
+++ b/test/battle/move_effect/rising_voltage.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Rising Voltage (Move Effect) test titles")
diff --git a/test/battle/move_effect/rollout.c b/test/battle/move_effect/rollout.c
new file mode 100644
index 0000000000..c137ca4fc8
--- /dev/null
+++ b/test/battle/move_effect/rollout.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Rollout (Move Effect) test titles")
diff --git a/test/battle/move_effect/safeguard.c b/test/battle/move_effect/safeguard.c
new file mode 100644
index 0000000000..44dee766ee
--- /dev/null
+++ b/test/battle/move_effect/safeguard.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Safeguard (Move Effect) test titles")
diff --git a/test/battle/move_effect/sandstorm.c b/test/battle/move_effect/sandstorm.c
new file mode 100644
index 0000000000..7a70a2f3ff
--- /dev/null
+++ b/test/battle/move_effect/sandstorm.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sandstorm (Move Effect) test titles")
diff --git a/test/battle/move_effect/shell_smash.c b/test/battle/move_effect/shell_smash.c
new file mode 100644
index 0000000000..af31e771ad
--- /dev/null
+++ b/test/battle/move_effect/shell_smash.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Shell Smash (Move Effect) test titles")
diff --git a/test/battle/move_effect/shift_gear.c b/test/battle/move_effect/shift_gear.c
new file mode 100644
index 0000000000..990e815cb3
--- /dev/null
+++ b/test/battle/move_effect/shift_gear.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Shift Gear (Move Effect) test titles")
diff --git a/test/battle/move_effect/shore_up.c b/test/battle/move_effect/shore_up.c
new file mode 100644
index 0000000000..91ee4f05b6
--- /dev/null
+++ b/test/battle/move_effect/shore_up.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Shore Up (Move Effect) test titles")
diff --git a/test/battle/move_effect/sky_drop.c b/test/battle/move_effect/sky_drop.c
new file mode 100644
index 0000000000..f0482788dd
--- /dev/null
+++ b/test/battle/move_effect/sky_drop.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sky Drop (Move Effect) test titles")
diff --git a/test/battle/move_effect/smack_down.c b/test/battle/move_effect/smack_down.c
deleted file mode 100644
index eb924ea1ac..0000000000
--- a/test/battle/move_effect/smack_down.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "global.h"
-#include "test/battle.h"
-
-ASSUMPTIONS
-{
-    ASSUME(MoveHasAdditionalEffect(MOVE_SMACK_DOWN, MOVE_EFFECT_SMACK_DOWN) == TRUE);
-}
-
-SINGLE_BATTLE_TEST("Smack Down does not ground mons behind substitutes")
-{
-    GIVEN {
-        PLAYER(SPECIES_WOBBUFFET);
-        OPPONENT(SPECIES_SKARMORY);
-    } WHEN {
-        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_SMACK_DOWN); }
-    } SCENE {
-        NOT MESSAGE("The opposing Skarmory fell straight down!");
-    }
-}
diff --git a/test/battle/move_effect/smelling_salts.c b/test/battle/move_effect/smelling_salts.c
deleted file mode 100644
index 6b1d0b2d7e..0000000000
--- a/test/battle/move_effect/smelling_salts.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "global.h"
-#include "test/battle.h"
-
-ASSUMPTIONS
-{
-    ASSUME(MoveHasAdditionalEffect(MOVE_SMELLING_SALTS, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
-    ASSUME(GetMoveEffectArg_Status(MOVE_SMELLING_SALTS) == STATUS1_PARALYSIS);
-}
-
-SINGLE_BATTLE_TEST("Smelling Salts does not cure paralyzed pokemons behind substitutes or get increased power")
-{
-    u32 ability;
-    PARAMETRIZE { ability = ABILITY_INNER_FOCUS; }
-    PARAMETRIZE { ability = ABILITY_INFILTRATOR; }
-    GIVEN {
-        PLAYER(SPECIES_CROBAT) { Ability(ability); }
-        OPPONENT(SPECIES_SEISMITOAD) { Status1(STATUS1_PARALYSIS); }
-    } WHEN {
-        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_CELEBRATE); }
-        TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_SMELLING_SALTS); }
-    } SCENE {
-        ANIMATION(ANIM_TYPE_MOVE, MOVE_SMELLING_SALTS, player);
-        if (ability == ABILITY_INNER_FOCUS)
-        {
-            MESSAGE("The substitute took damage for the opposing Seismitoad!");
-            NONE_OF
-            {
-                MESSAGE("The opposing Seismitoad's substitute faded!"); // Smelling Salts does 86 damage, the sub has 122 HP, if hitting a sub it shouldn't get boosted damage.
-                MESSAGE("The opposing Seismitoad was cured of paralysis!");
-                STATUS_ICON(opponent, none: TRUE);
-            }
-        }
-        else
-        {
-            MESSAGE("The opposing Seismitoad was cured of paralysis!");
-            STATUS_ICON(opponent, none: TRUE);
-        }
-    }
-}
-
-SINGLE_BATTLE_TEST("Smelling Salts get incread power vs. paralyzed targets")
-{
-    u32 status1;
-    PARAMETRIZE { status1 = STATUS1_PARALYSIS; }
-    PARAMETRIZE { status1 = STATUS1_NONE; }
-    GIVEN {
-        PLAYER(SPECIES_CROBAT);
-        OPPONENT(SPECIES_LOTAD) { Status1(status1); }
-    } WHEN {
-        TURN { MOVE(player, MOVE_SMELLING_SALTS); }
-    } SCENE {
-        ANIMATION(ANIM_TYPE_MOVE, MOVE_SMELLING_SALTS, player);
-        if (status1 == STATUS1_PARALYSIS)
-        {
-            MESSAGE("The opposing Lotad fainted!");
-        }
-        else
-        {
-            NOT MESSAGE("The opposing Lotad fainted!");
-            MESSAGE("The opposing Lotad used Celebrate!");
-        }
-    }
-}
diff --git a/test/battle/move_effect/snatch.c b/test/battle/move_effect/snatch.c
new file mode 100644
index 0000000000..f8e2891837
--- /dev/null
+++ b/test/battle/move_effect/snatch.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Snatch (Move Effect) test titles")
diff --git a/test/battle/move_effect/snipe_shot.c b/test/battle/move_effect/snipe_shot.c
new file mode 100644
index 0000000000..7ef7cbeb28
--- /dev/null
+++ b/test/battle/move_effect/snipe_shot.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Snipe Shot (Move Effect) test titles")
diff --git a/test/battle/move_effect/snowscape.c b/test/battle/move_effect/snowscape.c
new file mode 100644
index 0000000000..a0d1275f66
--- /dev/null
+++ b/test/battle/move_effect/snowscape.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Snowscape (Move Effect) test titles")
diff --git a/test/battle/move_effect/soak.c b/test/battle/move_effect/soak.c
new file mode 100644
index 0000000000..156e1f9558
--- /dev/null
+++ b/test/battle/move_effect/soak.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Soak (Move Effect) test titles")
diff --git a/test/battle/move_effect/softboiled.c b/test/battle/move_effect/softboiled.c
new file mode 100644
index 0000000000..a4cbce5b93
--- /dev/null
+++ b/test/battle/move_effect/softboiled.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Softboiled (Move Effect) test titles")
diff --git a/test/battle/move_effect/sparkling_aria.c b/test/battle/move_effect/sparkling_aria.c
deleted file mode 100644
index 86b906228b..0000000000
--- a/test/battle/move_effect/sparkling_aria.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "global.h"
-#include "test/battle.h"
-
-ASSUMPTIONS
-{
-    ASSUME(MoveHasAdditionalEffect(MOVE_SPARKLING_ARIA, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
-    ASSUME(GetMoveEffectArg_Status(MOVE_SPARKLING_ARIA) == STATUS1_BURN);
-    ASSUME(IsSoundMove(MOVE_SPARKLING_ARIA));
-}
-
-DOUBLE_BATTLE_TEST("Sparkling Aria cures burns from all Pokemon on the field and behind substitutes")
-{
-    GIVEN {
-        PLAYER(SPECIES_PRIMARINA);
-        PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); }
-        OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); }
-        OPPONENT(SPECIES_WYNAUT) { Status1(STATUS1_BURN); }
-    } WHEN {
-        TURN { MOVE(opponentLeft, MOVE_SUBSTITUTE); MOVE(opponentRight, MOVE_CELEBRATE); MOVE(playerRight, MOVE_CELEBRATE); MOVE(playerLeft, MOVE_SPARKLING_ARIA); }
-    } SCENE {
-        MESSAGE("The opposing Wobbuffet's burn was cured!");
-        MESSAGE("Wobbuffet's burn was cured!");
-        MESSAGE("The opposing Wynaut's burn was cured!");
-    }
-}
diff --git a/test/battle/move_effect/special_attack_down_2.c b/test/battle/move_effect/special_attack_down_2.c
new file mode 100644
index 0000000000..b62d4b52ac
--- /dev/null
+++ b/test/battle/move_effect/special_attack_down_2.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Eerie Impulse (Move Effect) test titles")
diff --git a/test/battle/move_effect/special_attack_up.c b/test/battle/move_effect/special_attack_up.c
new file mode 100644
index 0000000000..964566a8db
--- /dev/null
+++ b/test/battle/move_effect/special_attack_up.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sp.Atk +1 (Move Effect) test titles") // Pre-gen5 Growth
diff --git a/test/battle/move_effect/special_attack_up_2.c b/test/battle/move_effect/special_attack_up_2.c
new file mode 100644
index 0000000000..c4bf38d6aa
--- /dev/null
+++ b/test/battle/move_effect/special_attack_up_2.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Nasty Plot (Move Effect) test titles")
diff --git a/test/battle/move_effect/special_defense_down.c b/test/battle/move_effect/special_defense_down.c
new file mode 100644
index 0000000000..1769ff6975
--- /dev/null
+++ b/test/battle/move_effect/special_defense_down.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sp.Def -1 (Move Effect) test titles") // No move has this effect
diff --git a/test/battle/move_effect/special_defense_down_2.c b/test/battle/move_effect/special_defense_down_2.c
new file mode 100644
index 0000000000..5fff5bdd7b
--- /dev/null
+++ b/test/battle/move_effect/special_defense_down_2.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Fake Tears/Metal Sound (Move Effect) test titles")
diff --git a/test/battle/move_effect/special_defense_up.c b/test/battle/move_effect/special_defense_up.c
new file mode 100644
index 0000000000..66bbfa4dc5
--- /dev/null
+++ b/test/battle/move_effect/special_defense_up.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sp.Def +1 (Move Effect) test titles") // No move has this effect
diff --git a/test/battle/move_effect/special_defense_up_2.c b/test/battle/move_effect/special_defense_up_2.c
new file mode 100644
index 0000000000..1685663452
--- /dev/null
+++ b/test/battle/move_effect/special_defense_up_2.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Amnesia (Move Effect) test titles")
diff --git a/test/battle/move_effect/speed_down_2.c b/test/battle/move_effect/speed_down_2.c
new file mode 100644
index 0000000000..e3b95e3fe9
--- /dev/null
+++ b/test/battle/move_effect/speed_down_2.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Scary Face/Cotton Spore (Move Effect) test titles")
diff --git a/test/battle/move_effect/speed_up.c b/test/battle/move_effect/speed_up.c
new file mode 100644
index 0000000000..1b0d417ef6
--- /dev/null
+++ b/test/battle/move_effect/speed_up.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Speed +1 (Move Effect) test titles") // No move has this effect
diff --git a/test/battle/move_effect/speed_up_2.c b/test/battle/move_effect/speed_up_2.c
new file mode 100644
index 0000000000..7202555498
--- /dev/null
+++ b/test/battle/move_effect/speed_up_2.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Agility/Rock Polish (Move Effect) test titles")
diff --git a/test/battle/move_effect/spite.c b/test/battle/move_effect/spite.c
new file mode 100644
index 0000000000..6a23e16dd2
--- /dev/null
+++ b/test/battle/move_effect/spite.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Spite (Move Effect) test titles")
diff --git a/test/battle/move_effect/stored_power.c b/test/battle/move_effect/stored_power.c
new file mode 100644
index 0000000000..55788a1ff0
--- /dev/null
+++ b/test/battle/move_effect/stored_power.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Stored Power (Move Effect) test titles")
diff --git a/test/battle/move_effect/sunny_day.c b/test/battle/move_effect/sunny_day.c
new file mode 100644
index 0000000000..d7fed979d9
--- /dev/null
+++ b/test/battle/move_effect/sunny_day.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Sunny Day (Move Effect) test titles")
diff --git a/test/battle/move_effect/super_fang.c b/test/battle/move_effect/super_fang.c
new file mode 100644
index 0000000000..33e162395d
--- /dev/null
+++ b/test/battle/move_effect/super_fang.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Super Fang (Move Effect) test titles")
diff --git a/test/battle/move_effect/swagger.c b/test/battle/move_effect/swagger.c
new file mode 100644
index 0000000000..5845d4292f
--- /dev/null
+++ b/test/battle/move_effect/swagger.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Swagger (Move Effect) test titles")
diff --git a/test/battle/move_effect/synchronoise.c b/test/battle/move_effect/synchronoise.c
new file mode 100644
index 0000000000..9b68ccc63a
--- /dev/null
+++ b/test/battle/move_effect/synchronoise.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Synchronoise (Move Effect) test titles")
diff --git a/test/battle/move_effect/taunt.c b/test/battle/move_effect/taunt.c
new file mode 100644
index 0000000000..91fe13364d
--- /dev/null
+++ b/test/battle/move_effect/taunt.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Taunt (Move Effect) test titles")
diff --git a/test/battle/move_effect/terrain_pulse.c b/test/battle/move_effect/terrain_pulse.c
new file mode 100644
index 0000000000..75b6802451
--- /dev/null
+++ b/test/battle/move_effect/terrain_pulse.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Terrain Pulse (Move Effect) test titles")
diff --git a/test/battle/move_effect/third_type.c b/test/battle/move_effect/third_type.c
new file mode 100644
index 0000000000..c3bcab38d2
--- /dev/null
+++ b/test/battle/move_effect/third_type.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Trick-or-Treat/Forest's Curse (Move Effect) test titles")
diff --git a/test/battle/move_effect/tickle.c b/test/battle/move_effect/tickle.c
new file mode 100644
index 0000000000..b5f5a56d69
--- /dev/null
+++ b/test/battle/move_effect/tickle.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Tickle (Move Effect) test titles")
diff --git a/test/battle/move_effect/topsy_turvy.c b/test/battle/move_effect/topsy_turvy.c
new file mode 100644
index 0000000000..6e5ce38097
--- /dev/null
+++ b/test/battle/move_effect/topsy_turvy.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Topsy Turvy (Move Effect) test titles")
diff --git a/test/battle/move_effect/toxic_thread.c b/test/battle/move_effect/toxic_thread.c
new file mode 100644
index 0000000000..9471b24bd6
--- /dev/null
+++ b/test/battle/move_effect/toxic_thread.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Toxic Thread (Move Effect) test titles")
diff --git a/test/battle/move_effect/transform.c b/test/battle/move_effect/transform.c
new file mode 100644
index 0000000000..fd6e5f5a94
--- /dev/null
+++ b/test/battle/move_effect/transform.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Transform (Move Effect) test titles")
diff --git a/test/battle/move_effect/trick.c b/test/battle/move_effect/trick.c
new file mode 100644
index 0000000000..3aa26af67a
--- /dev/null
+++ b/test/battle/move_effect/trick.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Trick (Move Effect) test titles")
diff --git a/test/battle/move_effect/trick_room.c b/test/battle/move_effect/trick_room.c
new file mode 100644
index 0000000000..615931ef15
--- /dev/null
+++ b/test/battle/move_effect/trick_room.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Trick Room (Move Effect) test titles")
diff --git a/test/battle/move_effect/trump_card.c b/test/battle/move_effect/trump_card.c
new file mode 100644
index 0000000000..21b5c48ca3
--- /dev/null
+++ b/test/battle/move_effect/trump_card.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Trump Card (Move Effect) test titles")
diff --git a/test/battle/move_effect/two_typed_move.c b/test/battle/move_effect/two_typed_move.c
new file mode 100644
index 0000000000..43c3515739
--- /dev/null
+++ b/test/battle/move_effect/two_typed_move.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Flying Press (Move Effect) test titles")
diff --git a/test/battle/move_effect/venom_drench.c b/test/battle/move_effect/venom_drench.c
new file mode 100644
index 0000000000..00dac65858
--- /dev/null
+++ b/test/battle/move_effect/venom_drench.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Venom Drench (Move Effect) test titles")
diff --git a/test/battle/move_effect/victory_dance.c b/test/battle/move_effect/victory_dance.c
new file mode 100644
index 0000000000..cd1d892428
--- /dev/null
+++ b/test/battle/move_effect/victory_dance.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Victory Dance (Move Effect) test titles")
diff --git a/test/battle/move_effect/wake_up_slap.c b/test/battle/move_effect/wake_up_slap.c
deleted file mode 100644
index 0e172bf053..0000000000
--- a/test/battle/move_effect/wake_up_slap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "global.h"
-#include "test/battle.h"
-
-ASSUMPTIONS
-{
-    ASSUME(MoveHasAdditionalEffect(MOVE_WAKE_UP_SLAP, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
-    ASSUME(GetMoveEffectArg_Status(MOVE_WAKE_UP_SLAP) == STATUS1_SLEEP);
-}
-
-SINGLE_BATTLE_TEST("Wake-Up Slap does not cure paralyzed pokemons behind substitutes or get increased power")
-{
-    u32 ability;
-    PARAMETRIZE { ability = ABILITY_INNER_FOCUS; }
-    PARAMETRIZE { ability = ABILITY_INFILTRATOR; }
-    GIVEN {
-        PLAYER(SPECIES_CROBAT) { Ability(ability); }
-        OPPONENT(SPECIES_SEISMITOAD);
-    } WHEN {
-        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_SING); }
-        TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_WAKE_UP_SLAP); }
-    } SCENE {
-        ANIMATION(ANIM_TYPE_MOVE, MOVE_WAKE_UP_SLAP, player);
-        if (ability == ABILITY_INNER_FOCUS) {
-            MESSAGE("The substitute took damage for the opposing Seismitoad!");
-            NONE_OF
-            {
-                MESSAGE("The opposing Seismitoad's substitute faded!"); // Smelling Salts does 86 damage, the sub has 122 HP, if hitting a sub it shouldn't get boosted damage.
-                MESSAGE("The opposing Seismitoad woke up!");
-                STATUS_ICON(opponent, none: TRUE);
-            }
-        } else {
-            MESSAGE("The opposing Seismitoad woke up!");
-            STATUS_ICON(opponent, none: TRUE);
-        }
-    }
-}
-
-SINGLE_BATTLE_TEST("Wake-Up Slap gets increased power against sleeping targets")
-{
-    u32 status1;
-    PARAMETRIZE { status1 = STATUS1_SLEEP; }
-    PARAMETRIZE { status1 = STATUS1_NONE; }
-    GIVEN {
-        PLAYER(SPECIES_CROBAT);
-        OPPONENT(SPECIES_LOTAD) { Status1(status1); }
-    } WHEN {
-        TURN { MOVE(player, MOVE_WAKE_UP_SLAP); }
-    } SCENE {
-        ANIMATION(ANIM_TYPE_MOVE, MOVE_WAKE_UP_SLAP, player);
-        if (status1 == STATUS1_SLEEP) {
-            MESSAGE("The opposing Lotad fainted!");
-        } else {
-            NOT MESSAGE("The opposing Lotad fainted!");
-            MESSAGE("The opposing Lotad used Celebrate!");
-        }
-    }
-}
diff --git a/test/battle/move_effect/water_sport.c b/test/battle/move_effect/water_sport.c
new file mode 100644
index 0000000000..f7521c1fcc
--- /dev/null
+++ b/test/battle/move_effect/water_sport.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Water Sport (Move Effect) test titles")
diff --git a/test/battle/move_effect/will_o_wisp.c b/test/battle/move_effect/will_o_wisp.c
new file mode 100644
index 0000000000..08b1bd6c69
--- /dev/null
+++ b/test/battle/move_effect/will_o_wisp.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Will-O-Wisp (Move Effect) test titles")
diff --git a/test/battle/move_effect/wish.c b/test/battle/move_effect/wish.c
new file mode 100644
index 0000000000..e96a3e1b11
--- /dev/null
+++ b/test/battle/move_effect/wish.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Wish (Move Effect) test titles")
diff --git a/test/battle/move_effect/wonder_room.c b/test/battle/move_effect/wonder_room.c
new file mode 100644
index 0000000000..113b7c55eb
--- /dev/null
+++ b/test/battle/move_effect/wonder_room.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Wonder Room (Move Effect) test titles")
diff --git a/test/battle/move_effect/yawn.c b/test/battle/move_effect/yawn.c
new file mode 100644
index 0000000000..ec150cc9bb
--- /dev/null
+++ b/test/battle/move_effect/yawn.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Yawn (Move Effect) test titles")
diff --git a/test/battle/move_effect/flame_burst.c b/test/battle/move_effect_secondary/flame_burst.c
similarity index 100%
rename from test/battle/move_effect/flame_burst.c
rename to test/battle/move_effect_secondary/flame_burst.c
diff --git a/test/battle/move_effect_secondary/remove_status.c b/test/battle/move_effect_secondary/remove_status.c
new file mode 100644
index 0000000000..0ff3d0f78c
--- /dev/null
+++ b/test/battle/move_effect_secondary/remove_status.c
@@ -0,0 +1,132 @@
+#include "global.h"
+#include "test/battle.h"
+
+SINGLE_BATTLE_TEST("Smelling Salts does not cure paralyzed pokemons behind substitutes or get increased power")
+{
+    u32 ability;
+    PARAMETRIZE { ability = ABILITY_INNER_FOCUS; }
+    PARAMETRIZE { ability = ABILITY_INFILTRATOR; }
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_SMELLING_SALTS, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
+        ASSUME(GetMoveEffectArg_Status(MOVE_SMELLING_SALTS) == STATUS1_PARALYSIS);
+        PLAYER(SPECIES_CROBAT) { Ability(ability); }
+        OPPONENT(SPECIES_SEISMITOAD) { Status1(STATUS1_PARALYSIS); }
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_CELEBRATE); }
+        TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_SMELLING_SALTS); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_SMELLING_SALTS, player);
+        if (ability == ABILITY_INNER_FOCUS)
+        {
+            MESSAGE("The substitute took damage for the opposing Seismitoad!");
+            NONE_OF
+            {
+                MESSAGE("The opposing Seismitoad's substitute faded!"); // Smelling Salts does 86 damage, the sub has 122 HP, if hitting a sub it shouldn't get boosted damage.
+                MESSAGE("The opposing Seismitoad was cured of paralysis!");
+                STATUS_ICON(opponent, none: TRUE);
+            }
+        }
+        else
+        {
+            MESSAGE("The opposing Seismitoad was cured of paralysis!");
+            STATUS_ICON(opponent, none: TRUE);
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Smelling Salts get incread power vs. paralyzed targets")
+{
+    u32 status1;
+    PARAMETRIZE { status1 = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status1 = STATUS1_NONE; }
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_SMELLING_SALTS, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
+        ASSUME(GetMoveEffectArg_Status(MOVE_SMELLING_SALTS) == STATUS1_PARALYSIS);
+        PLAYER(SPECIES_CROBAT);
+        OPPONENT(SPECIES_LOTAD) { Status1(status1); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_SMELLING_SALTS); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_SMELLING_SALTS, player);
+        if (status1 == STATUS1_PARALYSIS)
+        {
+            MESSAGE("The opposing Lotad fainted!");
+        }
+        else
+        {
+            NOT MESSAGE("The opposing Lotad fainted!");
+            MESSAGE("The opposing Lotad used Celebrate!");
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Wake-Up Slap does not cure paralyzed pokemons behind substitutes or get increased power")
+{
+    u32 ability;
+    PARAMETRIZE { ability = ABILITY_INNER_FOCUS; }
+    PARAMETRIZE { ability = ABILITY_INFILTRATOR; }
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_WAKE_UP_SLAP, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
+        ASSUME(GetMoveEffectArg_Status(MOVE_WAKE_UP_SLAP) == STATUS1_SLEEP);
+        PLAYER(SPECIES_CROBAT) { Ability(ability); }
+        OPPONENT(SPECIES_SEISMITOAD);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_SING); }
+        TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_WAKE_UP_SLAP); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_WAKE_UP_SLAP, player);
+        if (ability == ABILITY_INNER_FOCUS) {
+            MESSAGE("The substitute took damage for the opposing Seismitoad!");
+            NONE_OF
+            {
+                MESSAGE("The opposing Seismitoad's substitute faded!"); // Smelling Salts does 86 damage, the sub has 122 HP, if hitting a sub it shouldn't get boosted damage.
+                MESSAGE("The opposing Seismitoad woke up!");
+                STATUS_ICON(opponent, none: TRUE);
+            }
+        } else {
+            MESSAGE("The opposing Seismitoad woke up!");
+            STATUS_ICON(opponent, none: TRUE);
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Wake-Up Slap gets increased power against sleeping targets")
+{
+    u32 status1;
+    PARAMETRIZE { status1 = STATUS1_SLEEP; }
+    PARAMETRIZE { status1 = STATUS1_NONE; }
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_WAKE_UP_SLAP, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
+        ASSUME(GetMoveEffectArg_Status(MOVE_WAKE_UP_SLAP) == STATUS1_SLEEP);
+        PLAYER(SPECIES_CROBAT);
+        OPPONENT(SPECIES_LOTAD) { Status1(status1); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_WAKE_UP_SLAP); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_WAKE_UP_SLAP, player);
+        if (status1 == STATUS1_SLEEP) {
+            MESSAGE("The opposing Lotad fainted!");
+        } else {
+            NOT MESSAGE("The opposing Lotad fainted!");
+            MESSAGE("The opposing Lotad used Celebrate!");
+        }
+    }
+}
+
+DOUBLE_BATTLE_TEST("Sparkling Aria cures burns from all Pokemon on the field and behind substitutes")
+{
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_SPARKLING_ARIA, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
+        ASSUME(GetMoveEffectArg_Status(MOVE_SPARKLING_ARIA) == STATUS1_BURN);
+        PLAYER(SPECIES_PRIMARINA);
+        PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); }
+        OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); }
+        OPPONENT(SPECIES_WYNAUT) { Status1(STATUS1_BURN); }
+    } WHEN {
+        TURN { MOVE(opponentLeft, MOVE_SUBSTITUTE); MOVE(opponentRight, MOVE_CELEBRATE); MOVE(playerRight, MOVE_CELEBRATE); MOVE(playerLeft, MOVE_SPARKLING_ARIA); }
+    } SCENE {
+        MESSAGE("The opposing Wobbuffet's burn was cured!");
+        MESSAGE("Wobbuffet's burn was cured!");
+        MESSAGE("The opposing Wynaut's burn was cured!");
+    }
+}
diff --git a/test/battle/move_effect/salt_cure.c b/test/battle/move_effect_secondary/salt_cure.c
similarity index 100%
rename from test/battle/move_effect/salt_cure.c
rename to test/battle/move_effect_secondary/salt_cure.c
diff --git a/test/battle/move_effect_secondary/smack_down.c b/test/battle/move_effect_secondary/smack_down.c
new file mode 100644
index 0000000000..64eba3889c
--- /dev/null
+++ b/test/battle/move_effect_secondary/smack_down.c
@@ -0,0 +1,28 @@
+#include "global.h"
+#include "test/battle.h"
+
+SINGLE_BATTLE_TEST("Smack Down does not ground mons behind substitutes")
+{
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_SMACK_DOWN, MOVE_EFFECT_SMACK_DOWN) == TRUE);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_SKARMORY);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_SMACK_DOWN); }
+    } SCENE {
+        NOT MESSAGE("The opposing Skarmory fell straight down!");
+    }
+}
+
+SINGLE_BATTLE_TEST("Thousand Arrows does not ground mons behind substitutes")
+{
+    GIVEN {
+        ASSUME(MoveHasAdditionalEffect(MOVE_THOUSAND_ARROWS, MOVE_EFFECT_SMACK_DOWN));
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_SKARMORY);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_THOUSAND_ARROWS); }
+    } SCENE {
+        NOT MESSAGE("The opposing Skarmory fell straight down!");
+    }
+}
diff --git a/test/battle/move_effect_secondary/will_o_wisp.c b/test/battle/move_effect_secondary/will_o_wisp.c
new file mode 100644
index 0000000000..08b1bd6c69
--- /dev/null
+++ b/test/battle/move_effect_secondary/will_o_wisp.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("TODO: Write Will-O-Wisp (Move Effect) test titles")
diff --git a/test/battle/move_effect/thousand_arrows.c b/test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
similarity index 70%
rename from test/battle/move_effect/thousand_arrows.c
rename to test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
index c62e71001d..8536986c6c 100644
--- a/test/battle/move_effect/thousand_arrows.c
+++ b/test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
@@ -1,30 +1,13 @@
 #include "global.h"
 #include "test/battle.h"
 
-ASSUMPTIONS
-{
-    ASSUME(MoveHasAdditionalEffect(MOVE_THOUSAND_ARROWS, MOVE_EFFECT_SMACK_DOWN));
-    ASSUME(MoveIgnoresTypeIfFlyingAndUngrounded(MOVE_THOUSAND_ARROWS) == TRUE);
-}
-
-SINGLE_BATTLE_TEST("Thousand Arrows does not ground mons behind substitutes")
-{
-    GIVEN {
-        PLAYER(SPECIES_WOBBUFFET);
-        OPPONENT(SPECIES_SKARMORY);
-    } WHEN {
-        TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_THOUSAND_ARROWS); }
-    } SCENE {
-        NOT MESSAGE("The opposing Skarmory fell straight down!");
-    }
-}
-
 SINGLE_BATTLE_TEST("Thousand Arrows does neutral damage to non-grounded Flying types regardless of other typings")
 {
     u32 pokemon;
     PARAMETRIZE { pokemon = SPECIES_SKARMORY; }
     PARAMETRIZE { pokemon = SPECIES_SCYTHER; }
     GIVEN {
+        ASSUME(MoveIgnoresTypeIfFlyingAndUngrounded(MOVE_THOUSAND_ARROWS) == TRUE);
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(pokemon);
     } WHEN {
diff --git a/test/battle/ability/switch_in_abilities.c b/test/battle/switch_in_abilities.c
similarity index 100%
rename from test/battle/ability/switch_in_abilities.c
rename to test/battle/switch_in_abilities.c