diff --git a/test/battle/ability/dragons_maw.c b/test/battle/ability/dragons_maw.c
index 07bbef9ce..af633d81d 100644
--- a/test/battle/ability/dragons_maw.c
+++ b/test/battle/ability/dragons_maw.c
@@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Dragon's Maw increases Dragon-type move damage", s16 damage)
     PARAMETRIZE { move = MOVE_DRAGON_BREATH; ability = ABILITY_DRAGONS_MAW; }
 
     GIVEN {
-        ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL);
+        ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_DRAGON);
         ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].type == TYPE_DRAGON);
         ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].type == TYPE_DRAGON);
         ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].split == SPLIT_PHYSICAL);
diff --git a/test/battle/ability/poison_heal.c b/test/battle/ability/poison_heal.c
index f79f8065c..2ee7620c6 100644
--- a/test/battle/ability/poison_heal.c
+++ b/test/battle/ability/poison_heal.c
@@ -4,8 +4,8 @@
 SINGLE_BATTLE_TEST("Poison Heal heals from (Toxic) Poison damage")
 {
     u8 status;
-    PARAMETRIZE { status=STATUS1_POISON; }
-    PARAMETRIZE { status=STATUS1_TOXIC_POISON; }
+    PARAMETRIZE { status = STATUS1_POISON; }
+    PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
 
     GIVEN {
         PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); Status1(status);  HP(1), MaxHP(400); }
@@ -28,8 +28,8 @@ SINGLE_BATTLE_TEST("Poison Heal heals from Toxic Poison damage are constant")
         PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); Status1(STATUS1_TOXIC_POISON);  HP(1), MaxHP(400); }
         OPPONENT(SPECIES_WOBBUFFET);
     } WHEN {
-        TURN { MOVE(player, MOVE_CELEBRATE); }
-        TURN { MOVE(player, MOVE_CELEBRATE); }
+        TURN { }
+        TURN { }
     } SCENE {
         ABILITY_POPUP(player, ABILITY_POISON_HEAL);
         MESSAGE("The poisoning healed Shroomish a little bit!");
diff --git a/test/battle/ability/rocky_payload.c b/test/battle/ability/rocky_payload.c
index 13efc9acf..498b09c9d 100644
--- a/test/battle/ability/rocky_payload.c
+++ b/test/battle/ability/rocky_payload.c
@@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Rocky Payload increases Rock-type move damage", s16 damage)
     PARAMETRIZE { move = MOVE_POWER_GEM; ability = ABILITY_ROCKY_PAYLOAD; }
 
     GIVEN {
-        ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL);
+        ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ROCK);
         ASSUME(gBattleMoves[MOVE_ROCK_THROW].type == TYPE_ROCK);
         ASSUME(gBattleMoves[MOVE_POWER_GEM].type == TYPE_ROCK);
         ASSUME(gBattleMoves[MOVE_ROCK_THROW].split == SPLIT_PHYSICAL);
diff --git a/test/battle/ability/sap_sipper.c b/test/battle/ability/sap_sipper.c
index 175ea4d96..89ec42249 100644
--- a/test/battle/ability/sap_sipper.c
+++ b/test/battle/ability/sap_sipper.c
@@ -52,4 +52,4 @@ SINGLE_BATTLE_TEST("Sap Sipper does not increase Attack if already maxed")
         NONE_OF { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); }
         NONE_OF { MESSAGE("Marill's Attack rose!"); }
     }
-}
\ No newline at end of file
+}
diff --git a/test/battle/ability/steelworker.c b/test/battle/ability/steelworker.c
index 73637a588..bf7d0ca9c 100644
--- a/test/battle/ability/steelworker.c
+++ b/test/battle/ability/steelworker.c
@@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Steelworker increases Steel-type move damage", s16 damage)
     PARAMETRIZE { move = MOVE_FLASH_CANNON; ability = ABILITY_STEELWORKER; }
 
     GIVEN {
-        ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL);
+        ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_STEEL);
         ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].type == TYPE_STEEL);
         ASSUME(gBattleMoves[MOVE_FLASH_CANNON].type == TYPE_STEEL);
         ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].split == SPLIT_PHYSICAL);
diff --git a/test/battle/ability/transistor.c b/test/battle/ability/transistor.c
index 344f554f0..3da12c832 100644
--- a/test/battle/ability/transistor.c
+++ b/test/battle/ability/transistor.c
@@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Transistor increases Electric-type move damage", s16 damage)
     PARAMETRIZE { move = MOVE_THUNDER_SHOCK; ability = ABILITY_TRANSISTOR; }
 
     GIVEN {
-        ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL);
+        ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ELECTRIC);
         ASSUME(gBattleMoves[MOVE_WILD_CHARGE].type == TYPE_ELECTRIC);
         ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC);
         ASSUME(gBattleMoves[MOVE_WILD_CHARGE].split == SPLIT_PHYSICAL);