diff --git a/src/battle_message.c b/src/battle_message.c
index cf57247bf..77ab90438 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -284,7 +284,7 @@ static const u8 sText_PkmnPreventsPoisoningWith[] = _("{B_EFF_NAME_WITH_PREFIX}'
 static const u8 sText_PkmnPreventsConfusionWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents confusion!");
 static const u8 sText_PkmnRaisedFirePowerWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nraised its FIRE power!");
 static const u8 sText_PkmnAnchorsItselfWith[] = _("{B_DEF_NAME_WITH_PREFIX} anchors\nitself with {B_DEF_ABILITY}!");
-static const u8 sText_PkmnCutsAttackWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncuts {B_DEF_NAME_WITH_PREFIX}'s ATTACK!");
+static const u8 sText_PkmnCutsAttackWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncuts {B_DEF_NAME_WITH_PREFIX}'s attack!");
 static const u8 sText_PkmnPreventsStatLossWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nprevents stat loss!");
 static const u8 sText_PkmnHurtsWith[] = _("{B_ATK_NAME_WITH_PREFIX} was hurt by\n{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}!");
 static const u8 sText_PkmnTraced[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} TRACED\n{B_BUFF1}'s {B_BUFF2}!");
diff --git a/test/ability_intimidate.c b/test/ability_intimidate.c
index f978b80ab..08d8d606e 100644
--- a/test/ability_intimidate.c
+++ b/test/ability_intimidate.c
@@ -10,11 +10,11 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch ou
 {
     u32 ability;
     PARAMETRIZE { ability = ABILITY_INTIMIDATE; }
-    PARAMETRIZE { ability = ABILITY_RECKLESS; }
+    PARAMETRIZE { ability = ABILITY_SHED_SKIN; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET);
         OPPONENT(SPECIES_WOBBUFFET);
-        OPPONENT(SPECIES_STARAPTOR) { Ability(ability); };
+        OPPONENT(SPECIES_ARBOK) { Ability(ability); };
     } WHEN {
         TURN { SWITCH(opponent, 1); }
         TURN { MOVE(player, MOVE_TACKLE); }
@@ -23,7 +23,7 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch ou
         {
             ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
             ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
-            MESSAGE("Foe Staraptor's Intimidate cuts Wobbuffet's ATTACK!");
+            MESSAGE("Foe Arbok's Intimidate cuts Wobbuffet's attack!");
         }
         HP_BAR(opponent, captureDamage: &results[i].damage);
     } FINALLY {
@@ -35,11 +35,11 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after KO", s16
 {
     u32 ability;
     PARAMETRIZE { ability = ABILITY_INTIMIDATE; }
-    PARAMETRIZE { ability = ABILITY_RECKLESS; }
+    PARAMETRIZE { ability = ABILITY_SHED_SKIN; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET) { Speed(2); };
         OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); };
-        OPPONENT(SPECIES_STARAPTOR) { Ability(ability); Speed(1); };
+        OPPONENT(SPECIES_ARBOK) { Ability(ability); Speed(1); };
     } WHEN {
         TURN { MOVE(player, MOVE_TACKLE); SEND_OUT(opponent, 1); }
         TURN { MOVE(player, MOVE_TACKLE); }
@@ -49,7 +49,7 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after KO", s16
         {
             ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
             ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
-            MESSAGE("Foe Staraptor's Intimidate cuts Wobbuffet's ATTACK!");
+            MESSAGE("Foe Arbok's Intimidate cuts Wobbuffet's attack!");
         }
         HP_BAR(opponent, captureDamage: &results[i].damage);
     } FINALLY {
@@ -63,11 +63,11 @@ DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double ba
         ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION);
         PLAYER(SPECIES_WOBBUFFET) { };
         PLAYER(SPECIES_WOBBUFFET) { HP(1); };
-        PLAYER(SPECIES_STARAVIA) { Ability(ABILITY_INTIMIDATE); };
+        PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); };
         PLAYER(SPECIES_ABRA);
         OPPONENT(SPECIES_WOBBUFFET) { HP(1); };
         OPPONENT(SPECIES_WOBBUFFET) { HP(1); };
-        OPPONENT(SPECIES_STARAPTOR) { Ability(ABILITY_INTIMIDATE); };
+        OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); };
         OPPONENT(SPECIES_WYNAUT);
     } WHEN {
         TURN { MOVE(playerLeft, MOVE_EXPLOSION); SEND_OUT(playerLeft, 2); SEND_OUT(opponentLeft, 2); SEND_OUT(playerRight, 3); SEND_OUT(opponentRight, 3); }
@@ -77,21 +77,21 @@ DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double ba
         ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, playerLeft);
         // Everyone faints.
 
-        MESSAGE("Go! Staravia!");
-        MESSAGE("2 sent out Staraptor!");
+        MESSAGE("Go! Ekans!");
+        MESSAGE("2 sent out Arbok!");
         MESSAGE("Go! Abra!");
         MESSAGE("2 sent out Wynaut!");
 
         ABILITY_POPUP(playerLeft, ABILITY_INTIMIDATE);
         ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft);
-        MESSAGE("Staravia's Intimidate cuts Foe Staraptor's ATTACK!");
+        MESSAGE("Ekans's Intimidate cuts Foe Arbok's attack!");
         ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight);
-        MESSAGE("Staravia's Intimidate cuts Foe Wynaut's ATTACK!");
+        MESSAGE("Ekans's Intimidate cuts Foe Wynaut's attack!");
 
         ABILITY_POPUP(opponentLeft, ABILITY_INTIMIDATE);
         ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerLeft);
-        MESSAGE("Foe Staraptor's Intimidate cuts Staravia's ATTACK!");
+        MESSAGE("Foe Arbok's Intimidate cuts Ekans's attack!");
         ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerRight);
-        MESSAGE("Foe Staraptor's Intimidate cuts Abra's ATTACK!");
+        MESSAGE("Foe Arbok's Intimidate cuts Abra's attack!");
     }
 }
diff --git a/test/ability_pastel_veil.c b/test/ability_pastel_veil.c
index 5d7a8f020..ddc080619 100644
--- a/test/ability_pastel_veil.c
+++ b/test/ability_pastel_veil.c
@@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Pastel Veil immediately cures Mold Breaker poison")
 {
     GIVEN {
         ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC);
-        PLAYER(SPECIES_DRILBUR) { Ability(ABILITY_MOLD_BREAKER); }
+        PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); }
         OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
     } WHEN {
         TURN { MOVE(player, MOVE_TOXIC); }
@@ -52,7 +52,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil does not cure Mold Breaker poison on partner")
 {
     GIVEN {
         ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC);
-        PLAYER(SPECIES_DRILBUR) { Ability(ABILITY_MOLD_BREAKER); }
+        PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); }
         PLAYER(SPECIES_WYNAUT);
         OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
         OPPONENT(SPECIES_WYNAUT);
diff --git a/test/ability_stench.c b/test/ability_stench.c
index 7285ee768..18d909768 100644
--- a/test/ability_stench.c
+++ b/test/ability_stench.c
@@ -6,7 +6,7 @@ SINGLE_BATTLE_TEST("Stench has a 10% chance to flinch")
     PASSES_RANDOMLY(1,10);
     GIVEN {
         ASSUME(gBattleMoves[MOVE_TACKLE].power > 0);
-        PLAYER(SPECIES_STUNKY) { Ability(ABILITY_STENCH); };
+        PLAYER(SPECIES_GRIMER) { Ability(ABILITY_STENCH); };
         OPPONENT(SPECIES_WOBBUFFET);
     } WHEN {
         TURN { MOVE(player, MOVE_TACKLE); MOVE(opponent, MOVE_CELEBRATE); }
@@ -22,7 +22,7 @@ SINGLE_BATTLE_TEST("Stench does not stack with King's Rock")
         ASSUME(gItems[ITEM_KINGS_ROCK].holdEffect == HOLD_EFFECT_FLINCH);
         ASSUME(gBattleMoves[MOVE_TACKLE].power > 0);
 
-        PLAYER(SPECIES_STUNKY) { Ability(ABILITY_STENCH); Item(ITEM_KINGS_ROCK); };
+        PLAYER(SPECIES_GRIMER) { Ability(ABILITY_STENCH); Item(ITEM_KINGS_ROCK); };
         OPPONENT(SPECIES_WOBBUFFET);
     } WHEN {
         TURN { MOVE(player, MOVE_TACKLE); MOVE(opponent, MOVE_CELEBRATE); }
diff --git a/test/hold_effect_red_card.c b/test/hold_effect_red_card.c
index c32c489d5..882007cfd 100644
--- a/test/hold_effect_red_card.c
+++ b/test/hold_effect_red_card.c
@@ -184,6 +184,7 @@ SINGLE_BATTLE_TEST("Red Card does not activate if stolen by Magician")
     PARAMETRIZE { item = ITEM_POTION; activate = TRUE; }
 
     GIVEN {
+        ASSUME(P_GEN_6_POKEMON == TRUE);
         PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); }
         OPPONENT(SPECIES_FENNEKIN) { Ability(ABILITY_MAGICIAN); Item(item); }
         OPPONENT(SPECIES_WYNAUT);
@@ -360,6 +361,7 @@ SINGLE_BATTLE_TEST("Red Card does not activate if attacker's Sheer Force applied
 SINGLE_BATTLE_TEST("Red Card activates before Emergency Exit")
 {
     GIVEN {
+        ASSUME(P_GEN_7_POKEMON == TRUE);
         PLAYER(SPECIES_GOLISOPOD) { MaxHP(100); HP(51); Item(ITEM_RED_CARD); }
         PLAYER(SPECIES_WIMPOD);
         OPPONENT(SPECIES_WOBBUFFET);
diff --git a/test/mega_evolution.c b/test/mega_evolution.c
index 13e9cd5b2..7080e85a3 100644
--- a/test/mega_evolution.c
+++ b/test/mega_evolution.c
@@ -37,15 +37,15 @@ SINGLE_BATTLE_TEST("Mega Evolution affects turn order")
 {
     GIVEN {
         ASSUME(B_MEGA_EVO_TURN_ORDER);
-        PLAYER(SPECIES_DIANCIE) { Item(ITEM_DIANCITE); Speed(105); }
+        PLAYER(SPECIES_GARDEVOIR) { Item(ITEM_GARDEVOIRITE); Speed(105); }
         OPPONENT(SPECIES_WOBBUFFET) { Speed(106); }
     } WHEN {
         TURN { MOVE(player, MOVE_CELEBRATE, megaEvolve: TRUE); }
     } SCENE {
-        MESSAGE("Diancie used Celebrate!");
+        MESSAGE("Gardevoir used Celebrate!");
         MESSAGE("Foe Wobbuffet used Celebrate!");
     } THEN {
-        ASSUME(player->speed == 225);
+        ASSUME(player->speed == 205);
     }
 }
 
diff --git a/test/move_effect_hit_escape.c b/test/move_effect_hit_escape.c
index cc34db2e2..fb5ff2dd5 100644
--- a/test/move_effect_hit_escape.c
+++ b/test/move_effect_hit_escape.c
@@ -65,6 +65,7 @@ SINGLE_BATTLE_TEST("U-turn does not switch the user out if replacements fainted"
 SINGLE_BATTLE_TEST("U-turn does not switch the user out if Wimp Out activates")
 {
     GIVEN {
+        ASSUME(P_GEN_7_POKEMON == TRUE);
         PLAYER(SPECIES_WOBBUFFET);
         PLAYER(SPECIES_WYNAUT);
         OPPONENT(SPECIES_WIMPOD) { MaxHP(100); HP(51); Ability(ABILITY_WIMP_OUT); }
@@ -82,6 +83,7 @@ SINGLE_BATTLE_TEST("U-turn does not switch the user out if Wimp Out activates")
 SINGLE_BATTLE_TEST("U-turn switches the user out if Wimp Out fails to activate")
 {
     GIVEN {
+        ASSUME(P_GEN_7_POKEMON == TRUE);
         PLAYER(SPECIES_WOBBUFFET);
         PLAYER(SPECIES_WYNAUT);
         OPPONENT(SPECIES_WIMPOD) { MaxHP(100); HP(51); Ability(ABILITY_WIMP_OUT); }