diff --git a/test/battle/ability/clear_body.c b/test/battle/ability/clear_body.c
index 0200601bb2..6fb1e127bc 100644
--- a/test/battle/ability/clear_body.c
+++ b/test/battle/ability/clear_body.c
@@ -45,7 +45,7 @@ SINGLE_BATTLE_TEST("Clear Body prevents stat stage reduction from moves")
         ASSUME(gMovesInfo[MOVE_SCARY_FACE].effect == EFFECT_SPEED_DOWN_2);
         ASSUME(gMovesInfo[MOVE_SWEET_SCENT].effect == EFFECT_EVASION_DOWN);
         ASSUME(gMovesInfo[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN);
-        PLAYER(SPECIES_ZIGZAGOON) { Moves(move); }
+        PLAYER(SPECIES_WOBBUFFET) { Moves(move); }
         OPPONENT(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); }
     } WHEN {
         TURN{ MOVE(player, move); }
@@ -60,13 +60,12 @@ SINGLE_BATTLE_TEST("Clear Body prevents Sticky Web")
 {
     GIVEN {
         ASSUME(gMovesInfo[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB);
-        ASSUME(gMovesInfo[MOVE_SELF_DESTRUCT].effect == EFFECT_EXPLOSION);
-        PLAYER(SPECIES_ARIADOS) { Speed(2); Moves(MOVE_STICKY_WEB, MOVE_PROTECT); }
-        OPPONENT(SPECIES_SNORLAX) { Speed(1); Moves(MOVE_CELEBRATE, MOVE_SELF_DESTRUCT); }
-        OPPONENT(SPECIES_BELDUM) { Speed(1); Ability(ABILITY_CLEAR_BODY); }
+        PLAYER(SPECIES_WOBBUFFET)
+        OPPONENT(SPECIES_WOBBUFFET)
+        OPPONENT(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); }
     } WHEN {
         TURN{ MOVE(player, MOVE_STICKY_WEB); MOVE(opponent, MOVE_CELEBRATE); }
-        TURN{ MOVE(player, MOVE_PROTECT); MOVE(opponent, MOVE_SELF_DESTRUCT); SEND_OUT(opponent, 1); }
+        TURN{ SWITCH(opponent, 1); }
     } SCENE {
         NONE_OF { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); }
         ABILITY_POPUP(opponent, ABILITY_CLEAR_BODY);
@@ -78,7 +77,7 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent stat stage reduction from moves u
 {
     GIVEN {
         ASSUME(gMovesInfo[MOVE_SUPERPOWER].additionalEffects->moveEffect == MOVE_EFFECT_ATK_DEF_DOWN);
-        PLAYER(SPECIES_ODDISH)
+        PLAYER(SPECIES_WOBBUFFET)
         OPPONENT(SPECIES_BELDUM) { Moves(MOVE_SUPERPOWER);  Ability(ABILITY_CLEAR_BODY); }
     } WHEN {
         TURN{ MOVE(opponent, MOVE_SUPERPOWER); }
@@ -99,7 +98,14 @@ SINGLE_BATTLE_TEST("Clear Body is ignored by Mold Breaker")
     PARAMETRIZE{ move = MOVE_SAND_ATTACK; }
 
     GIVEN {
-        PLAYER(SPECIES_ZIGZAGOON) { Ability(ABILITY_MOLD_BREAKER); Moves(move); }
+        ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN);
+        ASSUME(gMovesInfo[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN);
+        ASSUME(gMovesInfo[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN);
+        ASSUME(gMovesInfo[MOVE_FAKE_TEARS].effect == EFFECT_SPECIAL_DEFENSE_DOWN);
+        ASSUME(gMovesInfo[MOVE_SCARY_FACE].effect == EFFECT_SPEED_DOWN_2);
+        ASSUME(gMovesInfo[MOVE_SWEET_SCENT].effect == EFFECT_EVASION_DOWN);
+        ASSUME(gMovesInfo[MOVE_SAND_ATTACK].effect == EFFECT_ACCURACY_DOWN);
+        PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); Moves(move); }
         OPPONENT(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); }
     } WHEN {
         TURN{ MOVE(player, move); }
@@ -115,20 +121,20 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent Speed reduction from Iron Ball")
     PARAMETRIZE{ heldItem = ITEM_IRON_BALL; }
     GIVEN {
         ASSUME(gItemsInfo[ITEM_IRON_BALL].holdEffect == HOLD_EFFECT_IRON_BALL);
-        PLAYER(SPECIES_ZIGZAGOON) { Speed(4); }
+        PLAYER(SPECIES_WOBBUFFET) { Speed(4); }
         OPPONENT(SPECIES_BELDUM) { Speed(6); Ability(ABILITY_CLEAR_BODY); Item(heldItem); }
     } WHEN {
         TURN{ MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_CELEBRATE); }
     } SCENE {
         if (heldItem == ITEM_IRON_BALL)
         {
-            MESSAGE("Zigzagoon used Celebrate!");
+            MESSAGE("Wobbuffet used Celebrate!");
             MESSAGE("Foe Beldum used Celebrate!");
         }
         else
         {
             MESSAGE("Foe Beldum used Celebrate!");
-            MESSAGE("Zigzagoon used Celebrate!");
+            MESSAGE("Wobbuffet used Celebrate!");
         }
     }
 }
@@ -136,15 +142,15 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent Speed reduction from Iron Ball")
 SINGLE_BATTLE_TEST("Clear Body doesn't prevent Speed reduction from paralysis")
 {
     GIVEN {
-        PLAYER(SPECIES_ZIGZAGOON) { Speed(4); Moves(MOVE_THUNDER_WAVE); }
+        PLAYER(SPECIES_WOBBUFFET) { Speed(4); Moves(MOVE_THUNDER_WAVE); }
         OPPONENT(SPECIES_BELDUM) { Speed(6); Ability(ABILITY_CLEAR_BODY); }
     } WHEN {
         TURN{ MOVE(player, MOVE_THUNDER_WAVE); MOVE(opponent, MOVE_CELEBRATE); }
         TURN{ MOVE(player, MOVE_THUNDER_WAVE); MOVE(opponent, MOVE_CELEBRATE); }
     } SCENE {
             MESSAGE("Foe Beldum used Celebrate!");
-            MESSAGE("Zigzagoon used Thunder Wave!");
-            MESSAGE("Zigzagoon used Thunder Wave!");
+            MESSAGE("Wobbuffet used Thunder Wave!");
+            MESSAGE("Wobbuffet used Thunder Wave!");
             ONE_OF {
                 MESSAGE("Foe Beldum used Celebrate!");
                 MESSAGE("Foe Beldum is paralyzed! It can't move!");
@@ -175,14 +181,14 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent receiving negative stat changes f
     GIVEN {
         ASSUME(gMovesInfo[MOVE_SCARY_FACE].effect == EFFECT_SPEED_DOWN_2);
         ASSUME(gMovesInfo[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS);
-        PLAYER(SPECIES_ZIGZAGOON) { Speed(4); Moves(MOVE_SCARY_FACE); }
-        OPPONENT(SPECIES_EEVEE) { Speed(3); Moves(MOVE_BATON_PASS, MOVE_CELEBRATE); }
+        PLAYER(SPECIES_WOBBUFFET) { Speed(4); Moves(MOVE_SCARY_FACE); }
+        OPPONENT(SPECIES_WOBBUFFET) { Speed(3); Moves(MOVE_BATON_PASS); }
         OPPONENT(SPECIES_BELDUM) { Speed(6); Ability(ABILITY_CLEAR_BODY); }
     } WHEN {
         TURN{ MOVE(player, MOVE_SCARY_FACE); MOVE(opponent, MOVE_BATON_PASS); SEND_OUT(opponent, 1); }
         TURN{ MOVE(player, MOVE_SCARY_FACE); MOVE(opponent, MOVE_CELEBRATE); }
     } SCENE {
-            MESSAGE("Zigzagoon used Scary Face!");
+            MESSAGE("Wobbuffet used Scary Face!");
             MESSAGE("Foe Beldum used Celebrate!");
     }
 }
@@ -193,18 +199,18 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent Topsy-Turvy")
         ASSUME(gMovesInfo[MOVE_TOPSY_TURVY].effect == EFFECT_TOPSY_TURVY);
         ASSUME(gMovesInfo[MOVE_SCARY_FACE].effect == EFFECT_SPEED_DOWN_2);
         ASSUME(gMovesInfo[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS);
-        PLAYER(SPECIES_INKAY) { Speed(4); Moves(MOVE_SCARY_FACE, MOVE_TOPSY_TURVY); }
-        OPPONENT(SPECIES_EEVEE) { Speed(3); Moves(MOVE_BATON_PASS, MOVE_CELEBRATE); }
+        PLAYER(SPECIES_WOBBUFFET) { Speed(4); Moves(MOVE_SCARY_FACE, MOVE_TOPSY_TURVY); }
+        OPPONENT(SPECIES_WOBBUFFET) { Speed(3); Moves(MOVE_BATON_PASS); }
         OPPONENT(SPECIES_BELDUM) { Speed(6); Ability(ABILITY_CLEAR_BODY); }
     } WHEN {
         TURN{ MOVE(player, MOVE_SCARY_FACE); MOVE(opponent, MOVE_BATON_PASS); SEND_OUT(opponent, 1); }
         TURN{ MOVE(player, MOVE_TOPSY_TURVY); MOVE(opponent, MOVE_CELEBRATE); }
         TURN{ MOVE(player, MOVE_SCARY_FACE); MOVE(opponent, MOVE_CELEBRATE); }
     } SCENE {
-            MESSAGE("Inkay used Topsy-Turvy!");
+            MESSAGE("Wobbuffet used Topsy-Turvy!");
             MESSAGE("Foe Beldum used Celebrate!");
             MESSAGE("Foe Beldum used Celebrate!");
-            MESSAGE("Inkay used Scary Face!");
+            MESSAGE("Wobbuffet used Scary Face!");
     }
 }
 
@@ -213,7 +219,7 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent Spectral Thief from resetting pos
     GIVEN {
         ASSUME(gMovesInfo[MOVE_SPECTRAL_THIEF].additionalEffects->moveEffect == MOVE_EFFECT_SPECTRAL_THIEF);
         ASSUME(gMovesInfo[MOVE_AGILITY].effect == EFFECT_SPEED_UP_2);
-        PLAYER(SPECIES_ZIGZAGOON) { Speed(4); Moves(MOVE_SPECTRAL_THIEF, MOVE_CELEBRATE); }
+        PLAYER(SPECIES_WOBBUFFET) { Speed(4); Moves(MOVE_SPECTRAL_THIEF, MOVE_CELEBRATE); }
         OPPONENT(SPECIES_BELDUM) { Speed(5); Ability(ABILITY_CLEAR_BODY); Moves(MOVE_AGILITY, MOVE_CELEBRATE); }
     } WHEN {
         TURN{ MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_AGILITY); }
@@ -221,10 +227,10 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent Spectral Thief from resetting pos
         TURN{ MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_CELEBRATE); }
     } SCENE {
             MESSAGE("Foe Beldum used Agility!");
-            MESSAGE("Zigzagoon used Celebrate!");
+            MESSAGE("Wobbuffet used Celebrate!");
             MESSAGE("Foe Beldum used Celebrate!");
-            MESSAGE("Zigzagoon used Spectral Thief!");
-            MESSAGE("Zigzagoon used Celebrate!");
+            MESSAGE("Wobbuffet used SpectrlThief!");
+            MESSAGE("Wobbuffet used Celebrate!");
             MESSAGE("Foe Beldum used Celebrate!");
     }
 }