diff --git a/test/battle/ability/hyper_cutter.c b/test/battle/ability/hyper_cutter.c
index f040907626..8e5c0a40ba 100644
--- a/test/battle/ability/hyper_cutter.c
+++ b/test/battle/ability/hyper_cutter.c
@@ -69,8 +69,10 @@ SINGLE_BATTLE_TEST("Hyper Cutter is ignored by Mold Breaker")
         MESSAGE("Pinsir breaks the mold!");
         ANIMATION(ANIM_TYPE_MOVE, MOVE_GROWL, player);
         MESSAGE("Foe Krabby's Attack fell!");
-        NOT ABILITY_POPUP(opponent, ABILITY_HYPER_CUTTER);
-        NOT MESSAGE("Foe Krabby's Hyper Cutter prevents Attack loss!");
+        NONE_OF {
+            ABILITY_POPUP(opponent, ABILITY_HYPER_CUTTER);
+            MESSAGE("Foe Krabby's Hyper Cutter prevents Attack loss!");
+        }
     }
 }
 
diff --git a/test/battle/hold_effect/clear_amulet.c b/test/battle/hold_effect/clear_amulet.c
index c924f79912..0073f70609 100644
--- a/test/battle/hold_effect/clear_amulet.c
+++ b/test/battle/hold_effect/clear_amulet.c
@@ -83,7 +83,9 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents secondary effects that reduce stats")
     } WHEN {
         TURN { MOVE(player, move); }
     } SCENE {
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Wobbuffet's Clear Amulet prevents its stats from being lowered!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Wobbuffet's Clear Amulet prevents its stats from being lowered!");
+        }
     }
 }
diff --git a/test/battle/move_effect/octolock.c b/test/battle/move_effect/octolock.c
index 4b0b1dbf4d..3cdc5f5602 100644
--- a/test/battle/move_effect/octolock.c
+++ b/test/battle/move_effect/octolock.c
@@ -40,24 +40,30 @@ SINGLE_BATTLE_TEST("Octolock reduction is prevented by Clear Body, White Smoke a
             MESSAGE("Foe Beldum can no longer escape because of Octolock!");
             ABILITY_POPUP(opponent, ABILITY_CLEAR_BODY);
             MESSAGE("Foe Beldum's Clear Body prevents stat loss!");
-            NOT MESSAGE("Foe Beldum's Defense fell!");
-            NOT MESSAGE("Foe Beldum's Sp. Def fell!");
+            NONE_OF {
+                MESSAGE("Foe Beldum's Defense fell!");
+                MESSAGE("Foe Beldum's Sp. Def fell!");
+            }
         }
         else if (species == SPECIES_TORKOAL)
         {
             MESSAGE("Foe Torkoal can no longer escape because of Octolock!");
             ABILITY_POPUP(opponent, ABILITY_WHITE_SMOKE);
             MESSAGE("Foe Torkoal's White Smoke prevents stat loss!");
-            NOT MESSAGE("Foe Torkoal's Defense fell!");
-            NOT MESSAGE("Foe Torkoal's Sp. Def fell!");
+            NONE_OF {
+                MESSAGE("Foe Torkoal's Defense fell!");
+                MESSAGE("Foe Torkoal's Sp. Def fell!");
+            }
         }
         else if (species == SPECIES_SOLGALEO)
         {
             MESSAGE("Foe Solgaleo can no longer escape because of Octolock!");
             ABILITY_POPUP(opponent, ABILITY_FULL_METAL_BODY);
             MESSAGE("Foe Solgaleo's Full Metal Body prevents stat loss!");
-            NOT MESSAGE("Foe Solgaleo's Defense fell!");
-            NOT MESSAGE("Foe Solgaleo's Sp. Def fell!");
+            NONE_OF {
+                MESSAGE("Foe Solgaleo's Defense fell!");
+                MESSAGE("Foe Solgaleo's Sp. Def fell!");
+            }
         }
     }
 }
@@ -92,9 +98,11 @@ SINGLE_BATTLE_TEST("Octolock reduction is prevented by Clear Amulet")
         ANIMATION(ANIM_TYPE_MOVE, MOVE_OCTOLOCK, player);
         MESSAGE("Foe Wobbuffet can no longer escape because of Octolock!");
         MESSAGE("Foe Wobbuffet's Clear Amulet prevents its stats from being lowered!");
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Wobbuffet's Defense fell!");
-        NOT MESSAGE("Foe Wobbuffet's Sp. Def fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Wobbuffet's Defense fell!");
+            MESSAGE("Foe Wobbuffet's Sp. Def fell!");
+        }
     }
 }
 
@@ -117,7 +125,9 @@ SINGLE_BATTLE_TEST("Octolock will not decrease Defense and Sp. Def further then
         }
         MESSAGE("Foe Wobbuffet's Defense won't go lower!");
         MESSAGE("Foe Wobbuffet's Sp. Def won't go lower!");
-        NOT MESSAGE("Foe Wobbuffet's Defense fell!");
-        NOT MESSAGE("Foe Wobbuffet's Sp. Def fell!");
+        NONE_OF {
+            MESSAGE("Foe Wobbuffet's Defense fell!");
+            MESSAGE("Foe Wobbuffet's Sp. Def fell!");
+        }
     }
 }
diff --git a/test/battle/move_effect/syrup_bomb.c b/test/battle/move_effect/syrup_bomb.c
index 232f922f84..10e2c40de1 100644
--- a/test/battle/move_effect/syrup_bomb.c
+++ b/test/battle/move_effect/syrup_bomb.c
@@ -22,12 +22,14 @@ SINGLE_BATTLE_TEST("Syrup Bomb covers the foe in sticky syrup for 3 turns")
         MESSAGE("Foe Wobbuffet's Speed fell!");
         ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
         MESSAGE("Foe Wobbuffet's Speed fell!");
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Wobbuffet's Speed fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Wobbuffet's Speed fell!");
+        }
     }
 }
 
-SINGLE_BATTLE_TEST("Target will be not covered in sticky syrup again if it is currently covered")
+SINGLE_BATTLE_TEST("Sticky Syrup isn't applied again if the target is already covered")
 {
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
@@ -64,7 +66,7 @@ SINGLE_BATTLE_TEST("Syrup Bomb is prevented by Bulletproof")
     }
 }
 
-SINGLE_BATTLE_TEST("Clear Body, White Smoke and Full Metal Body prevent Sticky Syrup speed reduction")
+SINGLE_BATTLE_TEST("Sticky Syrup speed reduction is prevented by Clear Body, White Smoke or Full Metal Body")
 {
     u32 species;
     u32 ability;
@@ -88,27 +90,35 @@ SINGLE_BATTLE_TEST("Clear Body, White Smoke and Full Metal Body prevent Sticky S
             MESSAGE("Foe Beldum got covered in sticky syrup!");
             ABILITY_POPUP(opponent, ABILITY_CLEAR_BODY);
             MESSAGE("Foe Beldum's Clear Body prevents stat loss!");
+            NONE_OF {
+                ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+                MESSAGE("Foe Beldum's Speed fell!");
+            }
         }
         else if (species == SPECIES_TORKOAL)
         {
             MESSAGE("Foe Torkoal got covered in sticky syrup!");
             ABILITY_POPUP(opponent, ABILITY_WHITE_SMOKE);
             MESSAGE("Foe Torkoal's White Smoke prevents stat loss!");
+            NONE_OF {
+                ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+                MESSAGE("Foe Torkoal's Speed fell!");
+            }
         }
         else if (species == SPECIES_SOLGALEO)
         {
             MESSAGE("Foe Solgaleo got covered in sticky syrup!");
             ABILITY_POPUP(opponent, ABILITY_FULL_METAL_BODY);
             MESSAGE("Foe Solgaleo's Full Metal Body prevents stat loss!");
-        }
-        NONE_OF {
-            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-            MESSAGE("Foe Beldum's Speed fell!");
+            NONE_OF {
+                ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+                MESSAGE("Foe Solgaleo's Speed fell!");
+            }
         }
     }
 }
 
-SINGLE_BATTLE_TEST("Clear Amulet prevents Sticky Syrup speed reduction")
+SINGLE_BATTLE_TEST("Sticky Syrup speed reduction is prevented by Clear Amulet")
 {
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
@@ -119,7 +129,7 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents Sticky Syrup speed reduction")
         ANIMATION(ANIM_TYPE_MOVE, MOVE_SYRUP_BOMB, player);
         HP_BAR(opponent);
         MESSAGE("Foe Wobbuffet got covered in sticky syrup!");
-        MESSAGE("Foe Wobbuffet's Speed was not lowered!");
+        MESSAGE("Foe Wobbuffet's Clear Amulet prevents its stats from being lowered!");
         NONE_OF {
             ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
             MESSAGE("Foe Wobbuffet's Speed fell!");