diff --git a/test/battle/ability/corrosion.c b/test/battle/ability/corrosion.c
index 87477ddbcc37..8addbd90faab 100644
--- a/test/battle/ability/corrosion.c
+++ b/test/battle/ability/corrosion.c
@@ -106,23 +106,122 @@ SINGLE_BATTLE_TEST("If a Poison- or Steel-type Pokémon with Corrosion holds a T
 
 SINGLE_BATTLE_TEST("If a Poison- or Steel-type Pokémon with Corrosion poisons a target with Synchronize, Synchronize will not poison Poison- or Steel-type Pokémon")
 {
+    u16 move;
+    PARAMETRIZE { move = MOVE_TOXIC; }
+    PARAMETRIZE { move = MOVE_POISON_POWDER; }
     GIVEN {
         ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
+        ASSUME(gMovesInfo[MOVE_POISON_POWDER].effect == EFFECT_POISON);
         PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); }
         OPPONENT(SPECIES_ABRA) { Ability(ABILITY_SYNCHRONIZE); }
     } WHEN {
-        TURN { MOVE(player, MOVE_TOXIC); }
+        TURN { MOVE(player, move); }
     } SCENE {
-        ANIMATION(ANIM_TYPE_MOVE, MOVE_TOXIC, player);
+        ANIMATION(ANIM_TYPE_MOVE, move, player);
         ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, opponent);
-        STATUS_ICON(opponent, badPoison: TRUE);
+        if (move == MOVE_TOXIC)
+            STATUS_ICON(opponent, badPoison: TRUE);
+        else
+            STATUS_ICON(opponent, poison: TRUE);
         NONE_OF {
             ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, player);
             STATUS_ICON(player, badPoison: TRUE);
+            STATUS_ICON(player, poison: TRUE);
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Corrosion cannot bypass moves that prevent poisoning such as Safeguard")
+{
+    u16 move;
+    PARAMETRIZE { move = MOVE_TOXIC; }
+    PARAMETRIZE { move = MOVE_POISON_POWDER; }
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
+        ASSUME(gMovesInfo[MOVE_POISON_POWDER].effect == EFFECT_POISON);
+        PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); }
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_SAFEGUARD); MOVE(player, move); }
+    } SCENE {
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_MOVE, MOVE_TOXIC, player);
+            ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, opponent);
+            STATUS_ICON(opponent, badPoison: TRUE);
+            STATUS_ICON(opponent, poison: TRUE);
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Corrosion cannot bypass abilities that prevent poisoning such as Immunity")
+{
+    u16 move;
+    PARAMETRIZE { move = MOVE_TOXIC; }
+    PARAMETRIZE { move = MOVE_POISON_POWDER; }
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
+        ASSUME(gMovesInfo[MOVE_POISON_POWDER].effect == EFFECT_POISON);
+        PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); }
+        OPPONENT(SPECIES_SNORLAX) { Ability(ABILITY_IMMUNITY); }
+    } WHEN {
+        TURN { MOVE(player, move); }
+    } SCENE {
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_MOVE, MOVE_TOXIC, player);
+            ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, opponent);
+            STATUS_ICON(opponent, badPoison: TRUE);
+            STATUS_ICON(opponent, poison: TRUE);
         }
     }
 }
 
-TO_DO_BATTLE_TEST("Corrosion cannot bypass moves or Abilities that prevent poisoning, such as Safeguard or Immunity");
-TO_DO_BATTLE_TEST("If the Pokémon with this Ability uses Magic Coat to reflect a status move that inflicts poison, the reflected move will be able to poison Poison- or Steel-type Pokémon.");
-TO_DO_BATTLE_TEST("Moves used by a Pokémon with Corrosion that are reflected by Magic Coat or Magic Bounce do not retain the ability to poison Poison- or Steel-type Pokémon.")
+SINGLE_BATTLE_TEST("Corrosion allows the Pokémon with the ability to poison a Steel or Poison-type opponent by using Magic Coat")
+{
+    u16 move;
+    PARAMETRIZE { move = MOVE_TOXIC; }
+    PARAMETRIZE { move = MOVE_POISON_POWDER; }
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
+        ASSUME(gMovesInfo[MOVE_POISON_POWDER].effect == EFFECT_POISON);
+        ASSUME(gMovesInfo[MOVE_MAGIC_COAT].effect == EFFECT_MAGIC_COAT);
+        PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); }
+        OPPONENT(SPECIES_BELDUM);
+    } WHEN {
+        TURN { MOVE(player, MOVE_MAGIC_COAT); MOVE(opponent, move); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_COAT, player);
+        ANIMATION(ANIM_TYPE_MOVE, move, player); // Bounced by Magic Coat
+        ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, opponent);
+        if (move == MOVE_TOXIC)
+            STATUS_ICON(opponent, badPoison: TRUE);
+        else
+            STATUS_ICON(opponent, poison: TRUE);
+    }
+}
+
+SINGLE_BATTLE_TEST("Corrosion's effect is lost if the move used by the Pokémon with the ability is reflected by Magic Coat")
+{
+    u16 move;
+    PARAMETRIZE { move = MOVE_TOXIC; }
+    PARAMETRIZE { move = MOVE_POISON_POWDER; }
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
+        ASSUME(gMovesInfo[MOVE_POISON_POWDER].effect == EFFECT_POISON);
+        ASSUME(gMovesInfo[MOVE_MAGIC_COAT].effect == EFFECT_MAGIC_COAT);
+        PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); }
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_MAGIC_COAT); MOVE(player, move); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_COAT, opponent);
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_MOVE, move, player);
+            ANIMATION(ANIM_TYPE_MOVE, move, opponent);
+            ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, player);
+        if (move == MOVE_TOXIC)
+            STATUS_ICON(opponent, badPoison: TRUE);
+        else
+            STATUS_ICON(opponent, poison: TRUE);
+        }
+    }
+}
diff --git a/test/battle/ability/minds_eye.c b/test/battle/ability/minds_eye.c
index 6498f9f098dc..7799735ee2e8 100644
--- a/test/battle/ability/minds_eye.c
+++ b/test/battle/ability/minds_eye.c
@@ -49,8 +49,8 @@ AI_SINGLE_BATTLE_TEST("AI doesn't use accuracy-lowering moves if it knows that t
     for (j = MOVE_NONE + 1; j < MOVES_COUNT; j++)
     {
         if (gMovesInfo[j].effect == EFFECT_ACCURACY_DOWN || gMovesInfo[j].effect == EFFECT_ACCURACY_DOWN_2) {
-            PARAMETRIZE{ moveAI = j; abilityAI = ABILITY_SWIFT_SWIM; }
-            PARAMETRIZE{ moveAI = j; abilityAI = ABILITY_MOLD_BREAKER; }
+            PARAMETRIZE { moveAI = j; abilityAI = ABILITY_SWIFT_SWIM; }
+            PARAMETRIZE { moveAI = j; abilityAI = ABILITY_MOLD_BREAKER; }
         }
     }
 
diff --git a/test/battle/ai.c b/test/battle/ai.c
index 28e541befd58..faf3bbebb518 100644
--- a/test/battle/ai.c
+++ b/test/battle/ai.c
@@ -422,9 +422,9 @@ AI_DOUBLE_BATTLE_TEST("AI will not use Helping Hand if partner does not have any
 {
     u16 move1 = MOVE_NONE, move2 = MOVE_NONE, move3 = MOVE_NONE, move4 = MOVE_NONE;
 
-    PARAMETRIZE{ move1 = MOVE_LEER; move2 = MOVE_TOXIC; }
-    PARAMETRIZE{ move1 = MOVE_HELPING_HAND; move2 = MOVE_PROTECT; }
-    PARAMETRIZE{ move1 = MOVE_ACUPRESSURE; move2 = MOVE_DOUBLE_TEAM; move3 = MOVE_TOXIC; move4 = MOVE_PROTECT; }
+    PARAMETRIZE { move1 = MOVE_LEER; move2 = MOVE_TOXIC; }
+    PARAMETRIZE { move1 = MOVE_HELPING_HAND; move2 = MOVE_PROTECT; }
+    PARAMETRIZE { move1 = MOVE_ACUPRESSURE; move2 = MOVE_DOUBLE_TEAM; move3 = MOVE_TOXIC; move4 = MOVE_PROTECT; }
 
     GIVEN {
         AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT);
@@ -451,7 +451,7 @@ AI_DOUBLE_BATTLE_TEST("AI will not use a status move if partner already chose He
     for (j = MOVE_NONE + 1; j < MOVES_COUNT; j++)
     {
         if (gMovesInfo[j].category == DAMAGE_CATEGORY_STATUS) {
-            PARAMETRIZE{ statusMove = j; }
+            PARAMETRIZE { statusMove = j; }
         }
     }
 
@@ -585,9 +585,9 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: AI will not switch in a Pokemo
     u32 speedAlakazm;
     u32 aiSmartSwitchFlags = 0;
 
-    PARAMETRIZE{ speedAlakazm = 200; alakazamFirst = TRUE; } // AI will always send out Alakazan as it sees a KO with Focus Blast, even if Alakazam dies before it can get it off
-    PARAMETRIZE{ speedAlakazm = 200; alakazamFirst = FALSE; aiSmartSwitchFlags = AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES lets AI see that Alakazam would be KO'd before it can KO, and won't switch it in
-    PARAMETRIZE{ speedAlakazm = 400; alakazamFirst = TRUE; aiSmartSwitchFlags = AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES recognizes that Alakazam is faster and can KO, and will switch it in
+    PARAMETRIZE { speedAlakazm = 200; alakazamFirst = TRUE; } // AI will always send out Alakazan as it sees a KO with Focus Blast, even if Alakazam dies before it can get it off
+    PARAMETRIZE { speedAlakazm = 200; alakazamFirst = FALSE; aiSmartSwitchFlags = AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES lets AI see that Alakazam would be KO'd before it can KO, and won't switch it in
+    PARAMETRIZE { speedAlakazm = 400; alakazamFirst = TRUE; aiSmartSwitchFlags = AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES recognizes that Alakazam is faster and can KO, and will switch it in
 
     GIVEN {
         ASSUME(gMovesInfo[MOVE_PSYCHIC].category == DAMAGE_CATEGORY_SPECIAL);
@@ -634,8 +634,8 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: AI considers hazard damage whe
     u32 aiIsSmart = 0;
     u32 aiSmartSwitchFlags = 0;
 
-    PARAMETRIZE{ aiIsSmart = 0; aiSmartSwitchFlags = 0; } // AI doesn't care about hazard damage resulting in Pokemon being KO'd
-    PARAMETRIZE{ aiIsSmart = 1; aiSmartSwitchFlags = AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES avoids being KO'd as a result of hazards damage
+    PARAMETRIZE { aiIsSmart = 0; aiSmartSwitchFlags = 0; } // AI doesn't care about hazard damage resulting in Pokemon being KO'd
+    PARAMETRIZE { aiIsSmart = 1; aiSmartSwitchFlags = AI_FLAG_SMART_MON_CHOICES; } // AI_FLAG_SMART_MON_CHOICES avoids being KO'd as a result of hazards damage
 
     GIVEN {
         AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | aiSmartSwitchFlags);
@@ -656,10 +656,10 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: Mid-battle switches prioritize
     u32 move2;
     u32 expectedIndex;
 
-    PARAMETRIZE{ expectedIndex = 3; move1 = MOVE_TACKLE; move2 = MOVE_TACKLE; aiSmartSwitchFlags = 0; } // When not smart, AI will only switch in a defensive mon if it has a SE move, otherwise will just default to damage
-    PARAMETRIZE{ expectedIndex = 1; move1 = MOVE_GIGA_DRAIN; move2 = MOVE_TACKLE; aiSmartSwitchFlags = 0; }
-    PARAMETRIZE{ expectedIndex = 2; move1 = MOVE_TACKLE; move2 = MOVE_TACKLE; aiSmartSwitchFlags = AI_FLAG_SMART_MON_CHOICES; } // When smart, AI will prioritize SE move, but still switch in good type matchup without SE move
-    PARAMETRIZE{ expectedIndex = 1; move1 = MOVE_GIGA_DRAIN; move2 = MOVE_TACKLE; aiSmartSwitchFlags = AI_FLAG_SMART_MON_CHOICES; }
+    PARAMETRIZE { expectedIndex = 3; move1 = MOVE_TACKLE; move2 = MOVE_TACKLE; aiSmartSwitchFlags = 0; } // When not smart, AI will only switch in a defensive mon if it has a SE move, otherwise will just default to damage
+    PARAMETRIZE { expectedIndex = 1; move1 = MOVE_GIGA_DRAIN; move2 = MOVE_TACKLE; aiSmartSwitchFlags = 0; }
+    PARAMETRIZE { expectedIndex = 2; move1 = MOVE_TACKLE; move2 = MOVE_TACKLE; aiSmartSwitchFlags = AI_FLAG_SMART_MON_CHOICES; } // When smart, AI will prioritize SE move, but still switch in good type matchup without SE move
+    PARAMETRIZE { expectedIndex = 1; move1 = MOVE_GIGA_DRAIN; move2 = MOVE_TACKLE; aiSmartSwitchFlags = AI_FLAG_SMART_MON_CHOICES; }
 
     GIVEN {
         AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | aiSmartSwitchFlags);
@@ -716,8 +716,8 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will not switch out if Pokemo
 {
     u32 move1;
 
-    PARAMETRIZE{ move1 = MOVE_TACKLE; }
-    PARAMETRIZE{ move1 = MOVE_RAPID_SPIN; }
+    PARAMETRIZE { move1 = MOVE_TACKLE; }
+    PARAMETRIZE { move1 = MOVE_RAPID_SPIN; }
 
     GIVEN {
         ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL);
diff --git a/test/battle/hold_effect/cure_status.c b/test/battle/hold_effect/cure_status.c
index 5f985b803edb..37b88c4d07ea 100644
--- a/test/battle/hold_effect/cure_status.c
+++ b/test/battle/hold_effect/cure_status.c
@@ -163,12 +163,12 @@ SINGLE_BATTLE_TEST("Berry hold effect cures status if a pokemon enters a battle"
     u16 status;
     u16 item;
 
-    PARAMETRIZE{ status = STATUS1_BURN; item = ITEM_RAWST_BERRY; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; item = ITEM_ASPEAR_BERRY; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; item = ITEM_CHERI_BERRY; }
-    PARAMETRIZE{ status = STATUS1_POISON; item = ITEM_PECHA_BERRY; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; item = ITEM_PECHA_BERRY; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; item = ITEM_CHESTO_BERRY; }
+    PARAMETRIZE { status = STATUS1_BURN; item = ITEM_RAWST_BERRY; }
+    PARAMETRIZE { status = STATUS1_FREEZE; item = ITEM_ASPEAR_BERRY; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; item = ITEM_CHERI_BERRY; }
+    PARAMETRIZE { status = STATUS1_POISON; item = ITEM_PECHA_BERRY; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; item = ITEM_PECHA_BERRY; }
+    PARAMETRIZE { status = STATUS1_SLEEP; item = ITEM_CHESTO_BERRY; }
 
     GIVEN {
         ASSUME(gItemsInfo[ITEM_RAWST_BERRY].holdEffect == HOLD_EFFECT_CURE_BRN);
diff --git a/test/battle/item_effect/cure_status.c b/test/battle/item_effect/cure_status.c
index f73bbae32773..6c7cc2e64dea 100644
--- a/test/battle/item_effect/cure_status.c
+++ b/test/battle/item_effect/cure_status.c
@@ -112,12 +112,12 @@ SINGLE_BATTLE_TEST("Ice Heal heals a battler from being frozen")
 SINGLE_BATTLE_TEST("Full Heal heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_FULL_HEAL].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -134,12 +134,12 @@ SINGLE_BATTLE_TEST("Full Heal heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Heal Powder heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_HEAL_POWDER].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -156,12 +156,12 @@ SINGLE_BATTLE_TEST("Heal Powder heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Pewter Crunchies heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_PEWTER_CRUNCHIES].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -178,12 +178,12 @@ SINGLE_BATTLE_TEST("Pewter Crunchies heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Lava Cookies heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_LAVA_COOKIE].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -200,12 +200,12 @@ SINGLE_BATTLE_TEST("Lava Cookies heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Rage Candy Bar heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_RAGE_CANDY_BAR].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -222,12 +222,12 @@ SINGLE_BATTLE_TEST("Rage Candy Bar heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Old Gateu heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_OLD_GATEAU].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -244,12 +244,12 @@ SINGLE_BATTLE_TEST("Old Gateu heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Casteliacone heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_CASTELIACONE].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -266,12 +266,12 @@ SINGLE_BATTLE_TEST("Casteliacone heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Lumiose Galette heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_LUMIOSE_GALETTE].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -288,12 +288,12 @@ SINGLE_BATTLE_TEST("Lumiose Galette heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Shalour Sable heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_SHALOUR_SABLE].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
@@ -310,12 +310,12 @@ SINGLE_BATTLE_TEST("Shalour Sable heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Big Malasada heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_BIG_MALASADA].battleUsage == EFFECT_ITEM_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
diff --git a/test/battle/item_effect/heal_and_cure_status.c b/test/battle/item_effect/heal_and_cure_status.c
index 80719cf2311c..70dc8322dba9 100644
--- a/test/battle/item_effect/heal_and_cure_status.c
+++ b/test/battle/item_effect/heal_and_cure_status.c
@@ -9,13 +9,13 @@ ASSUMPTIONS
 SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
-    PARAMETRIZE{ status = STATUS1_NONE; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_NONE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET) { HP(1); MaxHP(300); Status1(status); }
         OPPONENT(SPECIES_WOBBUFFET);
@@ -35,13 +35,13 @@ SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures any primary s
 SINGLE_BATTLE_TEST("Full Restore restores a party members HP and cures any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
-    PARAMETRIZE{ status = STATUS1_NONE; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_NONE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET) { HP(1); MaxHP(300); Status1(status); }
         PLAYER(SPECIES_WYNAUT) { HP(1); MaxHP(300); Status1(status); }
@@ -64,12 +64,12 @@ SINGLE_BATTLE_TEST("Full Restore restores a party members HP and cures any prima
 SINGLE_BATTLE_TEST("Full Restore heals a battler from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET) { Status1(status); }
         OPPONENT(SPECIES_WYNAUT);
@@ -86,12 +86,12 @@ SINGLE_BATTLE_TEST("Full Restore heals a battler from any primary status")
 SINGLE_BATTLE_TEST("Full Restore heals a party member from any primary status")
 {
     u16 status;
-    PARAMETRIZE{ status = STATUS1_BURN; }
-    PARAMETRIZE{ status = STATUS1_FREEZE; }
-    PARAMETRIZE{ status = STATUS1_PARALYSIS; }
-    PARAMETRIZE{ status = STATUS1_POISON; }
-    PARAMETRIZE{ status = STATUS1_TOXIC_POISON; }
-    PARAMETRIZE{ status = STATUS1_SLEEP; }
+    PARAMETRIZE { status = STATUS1_BURN; }
+    PARAMETRIZE { status = STATUS1_FREEZE; }
+    PARAMETRIZE { status = STATUS1_PARALYSIS; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_SLEEP; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         PLAYER(SPECIES_WYNAUT) { Status1(status); }
diff --git a/test/battle/move_effect/acrobatics.c b/test/battle/move_effect/acrobatics.c
index bc34719a42b3..70953d0958d9 100644
--- a/test/battle/move_effect/acrobatics.c
+++ b/test/battle/move_effect/acrobatics.c
@@ -1,5 +1,48 @@
 #include "global.h"
 #include "test/battle.h"
 
-TO_DO_BATTLE_TEST("Acrobatics doubles in power if the user has no held item");
-TO_DO_BATTLE_TEST("Acrobatics still doubles in power when Flying Gem is consumed");
+ASSUMPTIONS
+{
+    ASSUME(gMovesInfo[MOVE_ACROBATICS].effect == EFFECT_ACROBATICS);
+    ASSUME(gMovesInfo[MOVE_ACROBATICS].type == TYPE_FLYING);
+}
+
+SINGLE_BATTLE_TEST("Acrobatics doubles in power if the user has no held item", s16 damage)
+{
+    u16 heldItem;
+    PARAMETRIZE { heldItem = ITEM_POTION; }
+    PARAMETRIZE { heldItem = ITEM_NONE; }
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET) { Item(heldItem); }
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_ACROBATICS); }
+    } SCENE {
+        HP_BAR(player, captureDamage: &results[i].damage);
+    } FINALLY {
+        EXPECT_MUL_EQ(results[0].damage, Q_4_12(2), results[1].damage);
+    }
+}
+
+SINGLE_BATTLE_TEST("Acrobatics still doubles in power when Flying Gem is consumed", s16 damage)
+{
+    u16 heldItem;
+    PARAMETRIZE { heldItem = ITEM_NONE; }
+    PARAMETRIZE { heldItem = ITEM_FLYING_GEM; }
+    GIVEN {
+        ASSUME(I_GEM_BOOST_POWER >= GEN_6);
+        ASSUME(gItemsInfo[ITEM_FLYING_GEM].holdEffect == HOLD_EFFECT_GEMS);
+        ASSUME(gItemsInfo[ITEM_FLYING_GEM].secondaryId == TYPE_FLYING);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET) { Item(heldItem); }
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_ACROBATICS); }
+    } SCENE {
+        HP_BAR(player, captureDamage: &results[i].damage);
+    } FINALLY {
+        if (I_GEM_BOOST_POWER >= GEN_6)
+            EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.3), (results[1].damage));
+        else
+            EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), (results[1].damage));
+    }
+}
diff --git a/test/battle/move_effect/attack_accuracy_up.c b/test/battle/move_effect/attack_accuracy_up.c
index 025a0cb86f3b..102f4d4d213b 100644
--- a/test/battle/move_effect/attack_accuracy_up.c
+++ b/test/battle/move_effect/attack_accuracy_up.c
@@ -1,4 +1,18 @@
 #include "global.h"
 #include "test/battle.h"
 
-TO_DO_BATTLE_TEST("Hone Claws increases Attack and Accuracy by one stage each");
+SINGLE_BATTLE_TEST("Hone Claws increases Attack and Accuracy by one stage each")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_HONE_CLAWS].effect == EFFECT_ATTACK_ACCURACY_UP);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(player, MOVE_HONE_CLAWS); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_HONE_CLAWS, player);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
+        MESSAGE("Wobbuffet's Attack rose!");
+        MESSAGE("Wobbuffet's accuracy rose!");
+    }
+}
diff --git a/test/battle/move_effect/aura_wheel.c b/test/battle/move_effect/aura_wheel.c
index fa4190dbdfae..3d601f3583a7 100644
--- a/test/battle/move_effect/aura_wheel.c
+++ b/test/battle/move_effect/aura_wheel.c
@@ -10,8 +10,8 @@ ASSUMPTIONS
 SINGLE_BATTLE_TEST("Aura Wheel raises Speed; fails if the user is not Morpeko")
 {
     u16 species;
-    PARAMETRIZE{ species = SPECIES_WOBBUFFET; }
-    PARAMETRIZE{ species = SPECIES_MORPEKO; }
+    PARAMETRIZE { species = SPECIES_WOBBUFFET; }
+    PARAMETRIZE { species = SPECIES_MORPEKO; }
     GIVEN {
         PLAYER(species);
         OPPONENT(SPECIES_WOBBUFFET);
diff --git a/test/battle/move_effect/embargo.c b/test/battle/move_effect/embargo.c
index 628fc4411963..a9b1b4523d1b 100644
--- a/test/battle/move_effect/embargo.c
+++ b/test/battle/move_effect/embargo.c
@@ -253,8 +253,8 @@ SINGLE_BATTLE_TEST("Embargo disables the effect of the Plate items on the move J
 {
     u32 heldItem;
 
-    PARAMETRIZE{ heldItem = ITEM_NONE; }
-    PARAMETRIZE{ heldItem = ITEM_PIXIE_PLATE; }
+    PARAMETRIZE { heldItem = ITEM_NONE; }
+    PARAMETRIZE { heldItem = ITEM_PIXIE_PLATE; }
     GIVEN {
         PLAYER(SPECIES_ARCEUS) { Item(heldItem); };
         OPPONENT(SPECIES_DRAGONITE);
@@ -274,8 +274,8 @@ SINGLE_BATTLE_TEST("Embargo disables the effect of the Drive items on the move T
 {
     u32 heldItem;
 
-    PARAMETRIZE{ heldItem = ITEM_NONE; }
-    PARAMETRIZE{ heldItem = ITEM_SHOCK_DRIVE; }
+    PARAMETRIZE { heldItem = ITEM_NONE; }
+    PARAMETRIZE { heldItem = ITEM_SHOCK_DRIVE; }
     GIVEN {
         PLAYER(SPECIES_GENESECT) { Item(heldItem); };
         OPPONENT(SPECIES_GYARADOS);
@@ -295,8 +295,8 @@ SINGLE_BATTLE_TEST("Embargo disables the effect of the Memory items on the move
 {
     u32 heldItem;
 
-    PARAMETRIZE{ heldItem = ITEM_NONE; }
-    PARAMETRIZE{ heldItem = ITEM_FIRE_MEMORY; }
+    PARAMETRIZE { heldItem = ITEM_NONE; }
+    PARAMETRIZE { heldItem = ITEM_FIRE_MEMORY; }
     GIVEN {
         PLAYER(SPECIES_SILVALLY) { Item(heldItem); };
         OPPONENT(SPECIES_VENUSAUR);
diff --git a/test/battle/move_effect/roost.c b/test/battle/move_effect/roost.c
index 1ae84dd088d7..b4c0186bf0a4 100644
--- a/test/battle/move_effect/roost.c
+++ b/test/battle/move_effect/roost.c
@@ -111,24 +111,24 @@ SINGLE_BATTLE_TEST("Roost suppresses the user's Flying-typing this turn, then re
 SINGLE_BATTLE_TEST("Roost, if used by a Flying/Flying type, treats the user as a Normal-type (or Typeless in Gen. 4) until the end of the turn")
 {
     u32 damagingMove;
-    PARAMETRIZE{ damagingMove = MOVE_POUND; }
-    PARAMETRIZE{ damagingMove = MOVE_KARATE_CHOP; }
-    PARAMETRIZE{ damagingMove = MOVE_GUST; }
-    PARAMETRIZE{ damagingMove = MOVE_POISON_STING; }
-    PARAMETRIZE{ damagingMove = MOVE_EARTHQUAKE; }
-    PARAMETRIZE{ damagingMove = MOVE_ROCK_THROW; }
-    PARAMETRIZE{ damagingMove = MOVE_LEECH_LIFE; }
-    PARAMETRIZE{ damagingMove = MOVE_LICK; }
-    PARAMETRIZE{ damagingMove = MOVE_STEEL_WING; }
-    PARAMETRIZE{ damagingMove = MOVE_EMBER; }
-    PARAMETRIZE{ damagingMove = MOVE_WATER_GUN; }
-    PARAMETRIZE{ damagingMove = MOVE_VINE_WHIP; }
-    PARAMETRIZE{ damagingMove = MOVE_THUNDER_SHOCK; }
-    PARAMETRIZE{ damagingMove = MOVE_CONFUSION; }
-    PARAMETRIZE{ damagingMove = MOVE_ICE_BEAM; }
-    PARAMETRIZE{ damagingMove = MOVE_DRAGON_BREATH; }
-    PARAMETRIZE{ damagingMove = MOVE_BITE; }
-    PARAMETRIZE{ damagingMove = MOVE_DISARMING_VOICE; }
+    PARAMETRIZE { damagingMove = MOVE_POUND; }
+    PARAMETRIZE { damagingMove = MOVE_KARATE_CHOP; }
+    PARAMETRIZE { damagingMove = MOVE_GUST; }
+    PARAMETRIZE { damagingMove = MOVE_POISON_STING; }
+    PARAMETRIZE { damagingMove = MOVE_EARTHQUAKE; }
+    PARAMETRIZE { damagingMove = MOVE_ROCK_THROW; }
+    PARAMETRIZE { damagingMove = MOVE_LEECH_LIFE; }
+    PARAMETRIZE { damagingMove = MOVE_LICK; }
+    PARAMETRIZE { damagingMove = MOVE_STEEL_WING; }
+    PARAMETRIZE { damagingMove = MOVE_EMBER; }
+    PARAMETRIZE { damagingMove = MOVE_WATER_GUN; }
+    PARAMETRIZE { damagingMove = MOVE_VINE_WHIP; }
+    PARAMETRIZE { damagingMove = MOVE_THUNDER_SHOCK; }
+    PARAMETRIZE { damagingMove = MOVE_CONFUSION; }
+    PARAMETRIZE { damagingMove = MOVE_ICE_BEAM; }
+    PARAMETRIZE { damagingMove = MOVE_DRAGON_BREATH; }
+    PARAMETRIZE { damagingMove = MOVE_BITE; }
+    PARAMETRIZE { damagingMove = MOVE_DISARMING_VOICE; }
 
     GIVEN {
         ASSUME(gSpeciesInfo[SPECIES_TORNADUS].types[0] == TYPE_FLYING);
@@ -179,24 +179,24 @@ SINGLE_BATTLE_TEST("Roost, if used by a Flying/Flying type, treats the user as a
 SINGLE_BATTLE_TEST("Roost, if used by a Mystery/Flying type, treats the user as a Mystery/Mystery type until the end of the turn")
 {
     u32 damagingMove;
-    PARAMETRIZE{ damagingMove = MOVE_POUND; }
-    PARAMETRIZE{ damagingMove = MOVE_KARATE_CHOP; }
-    PARAMETRIZE{ damagingMove = MOVE_GUST; }
-    PARAMETRIZE{ damagingMove = MOVE_POISON_STING; }
-    PARAMETRIZE{ damagingMove = MOVE_EARTHQUAKE; }
-    PARAMETRIZE{ damagingMove = MOVE_ROCK_THROW; }
-    PARAMETRIZE{ damagingMove = MOVE_LEECH_LIFE; }
-    PARAMETRIZE{ damagingMove = MOVE_LICK; }
-    PARAMETRIZE{ damagingMove = MOVE_STEEL_WING; }
-    PARAMETRIZE{ damagingMove = MOVE_EMBER; }
-    PARAMETRIZE{ damagingMove = MOVE_WATER_GUN; }
-    PARAMETRIZE{ damagingMove = MOVE_VINE_WHIP; }
-    PARAMETRIZE{ damagingMove = MOVE_THUNDER_SHOCK; }
-    PARAMETRIZE{ damagingMove = MOVE_CONFUSION; }
-    PARAMETRIZE{ damagingMove = MOVE_ICE_BEAM; }
-    PARAMETRIZE{ damagingMove = MOVE_DRAGON_BREATH; }
-    PARAMETRIZE{ damagingMove = MOVE_BITE; }
-    PARAMETRIZE{ damagingMove = MOVE_DISARMING_VOICE; }
+    PARAMETRIZE { damagingMove = MOVE_POUND; }
+    PARAMETRIZE { damagingMove = MOVE_KARATE_CHOP; }
+    PARAMETRIZE { damagingMove = MOVE_GUST; }
+    PARAMETRIZE { damagingMove = MOVE_POISON_STING; }
+    PARAMETRIZE { damagingMove = MOVE_EARTHQUAKE; }
+    PARAMETRIZE { damagingMove = MOVE_ROCK_THROW; }
+    PARAMETRIZE { damagingMove = MOVE_LEECH_LIFE; }
+    PARAMETRIZE { damagingMove = MOVE_LICK; }
+    PARAMETRIZE { damagingMove = MOVE_STEEL_WING; }
+    PARAMETRIZE { damagingMove = MOVE_EMBER; }
+    PARAMETRIZE { damagingMove = MOVE_WATER_GUN; }
+    PARAMETRIZE { damagingMove = MOVE_VINE_WHIP; }
+    PARAMETRIZE { damagingMove = MOVE_THUNDER_SHOCK; }
+    PARAMETRIZE { damagingMove = MOVE_CONFUSION; }
+    PARAMETRIZE { damagingMove = MOVE_ICE_BEAM; }
+    PARAMETRIZE { damagingMove = MOVE_DRAGON_BREATH; }
+    PARAMETRIZE { damagingMove = MOVE_BITE; }
+    PARAMETRIZE { damagingMove = MOVE_DISARMING_VOICE; }
 
     GIVEN {
         ASSUME(gSpeciesInfo[SPECIES_MOLTRES].types[0] == TYPE_FIRE);
diff --git a/test/battle/move_effect/strength_sap.c b/test/battle/move_effect/strength_sap.c
index 000f5ff41afb..0b055edb12e1 100644
--- a/test/battle/move_effect/strength_sap.c
+++ b/test/battle/move_effect/strength_sap.c
@@ -10,8 +10,8 @@ SINGLE_BATTLE_TEST("Strength Sap lowers Attack by 1 and restores HP based on tar
 {
     u32 atkStat = 0;
 
-    PARAMETRIZE{ atkStat = 100; }
-    PARAMETRIZE{ atkStat = 50; }
+    PARAMETRIZE { atkStat = 100; }
+    PARAMETRIZE { atkStat = 50; }
 
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET) { HP(200); }
@@ -35,8 +35,8 @@ SINGLE_BATTLE_TEST("Strength Sap works exactly the same when attacker is behind
 {
     u32 atkStat = 0;
 
-    PARAMETRIZE{ atkStat = 100; }
-    PARAMETRIZE{ atkStat = 50; }
+    PARAMETRIZE { atkStat = 100; }
+    PARAMETRIZE { atkStat = 50; }
 
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET) { HP(200); }
@@ -65,7 +65,7 @@ SINGLE_BATTLE_TEST("Strength Sap lowers Attack by 1 and restores HP based on tar
 
     for (j = 0; j <= MAX_STAT_STAGE; j++) {
         if (j == DEFAULT_STAT_STAGE - 1) { continue; } // Ignore -6, because Strength Sap won't work otherwise
-        PARAMETRIZE{ statStage = j; }
+        PARAMETRIZE { statStage = j; }
     }
 
     GIVEN {
diff --git a/test/battle/move_effect/two_turns_attack.c b/test/battle/move_effect/two_turns_attack.c
index 9225afb48eba..4b7adc6f812d 100644
--- a/test/battle/move_effect/two_turns_attack.c
+++ b/test/battle/move_effect/two_turns_attack.c
@@ -243,8 +243,8 @@ SINGLE_BATTLE_TEST("Solar Beam and Solar Blade can be used instantly in Sunlight
 SINGLE_BATTLE_TEST("Solar Beam's power is halved in Rain", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_RAIN_DANCE; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_RAIN_DANCE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WOBBUFFET);
@@ -261,8 +261,8 @@ SINGLE_BATTLE_TEST("Solar Beam's power is halved in Rain", s16 damage)
 SINGLE_BATTLE_TEST("Solar Blade's power is halved in Rain", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_RAIN_DANCE; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_RAIN_DANCE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WYNAUT);
@@ -279,8 +279,8 @@ SINGLE_BATTLE_TEST("Solar Blade's power is halved in Rain", s16 damage)
 SINGLE_BATTLE_TEST("Solar Beam's power is halved in a Sandstorm", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_SANDSTORM; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SANDSTORM; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); };
@@ -297,8 +297,8 @@ SINGLE_BATTLE_TEST("Solar Beam's power is halved in a Sandstorm", s16 damage)
 SINGLE_BATTLE_TEST("Solar Blade's power is halved in a Sandstorm", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_SANDSTORM; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SANDSTORM; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); };
@@ -315,8 +315,8 @@ SINGLE_BATTLE_TEST("Solar Blade's power is halved in a Sandstorm", s16 damage)
 SINGLE_BATTLE_TEST("Solar Beam's power is halved in Hail", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_HAIL; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_HAIL; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); };
@@ -333,8 +333,8 @@ SINGLE_BATTLE_TEST("Solar Beam's power is halved in Hail", s16 damage)
 SINGLE_BATTLE_TEST("Solar Blade's power is halved in Hail", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_HAIL; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_HAIL; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); };
@@ -351,8 +351,8 @@ SINGLE_BATTLE_TEST("Solar Blade's power is halved in Hail", s16 damage)
 SINGLE_BATTLE_TEST("Solar Beam's power is halved in Snow", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_SNOWSCAPE; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SNOWSCAPE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WOBBUFFET);
@@ -369,8 +369,8 @@ SINGLE_BATTLE_TEST("Solar Beam's power is halved in Snow", s16 damage)
 SINGLE_BATTLE_TEST("Solar Blade's power is halved in Snow", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_SNOWSCAPE; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SNOWSCAPE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WYNAUT);
diff --git a/test/battle/move_effect/weather_ball.c b/test/battle/move_effect/weather_ball.c
index 38c902f507f7..1656b60d87b0 100644
--- a/test/battle/move_effect/weather_ball.c
+++ b/test/battle/move_effect/weather_ball.c
@@ -9,8 +9,8 @@ ASSUMPTIONS
 SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Fire-type move in Sunlight", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_SUNNY_DAY; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SUNNY_DAY; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_MEGANIUM);
@@ -27,8 +27,8 @@ SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Fire-type move
 SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Water-type move in Rain", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_RAIN_DANCE; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_RAIN_DANCE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_ARCANINE);
@@ -45,8 +45,8 @@ SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Water-type mov
 SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Rock-type move in a Sandstorm", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_SANDSTORM; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SANDSTORM; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_MAGMAR) { Item(ITEM_SAFETY_GOGGLES); };
@@ -63,9 +63,9 @@ SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Rock-type move
 SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to an Ice-type move in Hail and Snow", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
-    PARAMETRIZE{ move = MOVE_HAIL; }
-    PARAMETRIZE{ move = MOVE_SNOWSCAPE; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_HAIL; }
+    PARAMETRIZE { move = MOVE_SNOWSCAPE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_DRAGONAIR) { Item(ITEM_SAFETY_GOGGLES); };
diff --git a/test/battle/move_effects_combined/hurricane.c b/test/battle/move_effects_combined/hurricane.c
index eab843e7209f..61acac664994 100644
--- a/test/battle/move_effects_combined/hurricane.c
+++ b/test/battle/move_effects_combined/hurricane.c
@@ -32,4 +32,42 @@ SINGLE_BATTLE_TEST("Hurricane bypasses accuracy checks in Rain")
         NONE_OF { MESSAGE("Wobbuffet's attack missed!"); }
     }
 }
-TO_DO_BATTLE_TEST("Hurricane Veil can hit airborne targets") // Fly, Bounce, Sky Drop
+
+SINGLE_BATTLE_TEST("Hurricane can hit airborne targets (Fly, Bounce)")
+{
+    u16 move;
+    PARAMETRIZE { move = MOVE_FLY; }
+    PARAMETRIZE { move = MOVE_BOUNCE; }
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_FLY].effect == EFFECT_SEMI_INVULNERABLE);
+        ASSUME(UNCOMPRESS_BITS(HIHALF(gMovesInfo[MOVE_FLY].argument)) == STATUS3_ON_AIR);
+        ASSUME(gMovesInfo[MOVE_BOUNCE].effect == EFFECT_SEMI_INVULNERABLE);
+        ASSUME(UNCOMPRESS_BITS(HIHALF(gMovesInfo[MOVE_BOUNCE].argument)) == STATUS3_ON_AIR);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET) { Moves(move); }
+    } WHEN {
+        TURN { MOVE(opponent, move); MOVE(player, MOVE_HURRICANE); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, move, opponent);
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_HURRICANE, player);
+        NONE_OF { MESSAGE("Wobbuffet's attack missed!"); }
+    }
+}
+
+DOUBLE_BATTLE_TEST("Hurricane can hit airborne targets (Sky Drop)")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_SKY_DROP].effect == EFFECT_SKY_DROP);
+        ASSUME(UNCOMPRESS_BITS(HIHALF(gMovesInfo[MOVE_SKY_DROP].argument)) == STATUS3_ON_AIR);
+        PLAYER(SPECIES_WOBBUFFET);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(playerLeft, MOVE_SKY_DROP, target: opponentLeft); MOVE(playerRight, MOVE_HURRICANE, target: playerLeft); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_SKY_DROP, playerLeft);
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_HURRICANE, playerRight);
+        NONE_OF { MESSAGE("Wobbuffet's attack missed!"); }
+    }
+}
diff --git a/test/battle/weather/sandstorm.c b/test/battle/weather/sandstorm.c
index 5d7a6f1713cf..2f3f4e7ca266 100644
--- a/test/battle/weather/sandstorm.c
+++ b/test/battle/weather/sandstorm.c
@@ -20,8 +20,8 @@ SINGLE_BATTLE_TEST("Sandstorm deals 1/16 damage per turn")
 SINGLE_BATTLE_TEST("Sandstorm multiplies the special defense of Rock-types by 1.5x", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_SANDSTORM; }
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SANDSTORM; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
     GIVEN {
         ASSUME(gMovesInfo[MOVE_SWIFT].category == DAMAGE_CATEGORY_SPECIAL);
         PLAYER(SPECIES_WOBBUFFET) ;
diff --git a/test/battle/weather/snow.c b/test/battle/weather/snow.c
index c617f651c495..6ce3e1e0f2fb 100644
--- a/test/battle/weather/snow.c
+++ b/test/battle/weather/snow.c
@@ -13,8 +13,8 @@ ASSUMPTIONS
 SINGLE_BATTLE_TEST("Snow multiplies the defense of Ice-types by 1.5x", s16 damage)
 {
     u16 move;
-    PARAMETRIZE{ move = MOVE_SNOWSCAPE; }
-    PARAMETRIZE{ move = MOVE_CELEBRATE; }
+    PARAMETRIZE { move = MOVE_SNOWSCAPE; }
+    PARAMETRIZE { move = MOVE_CELEBRATE; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_GLALIE);