diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts
index cc69334b805..58e67a6ebe6 100644
--- a/src/test/abilities/libero.test.ts
+++ b/src/test/abilities/libero.test.ts
@@ -1,18 +1,17 @@
+import { allMoves } from "#app/data/move.js";
+import { Type } from "#app/data/type.js";
+import { Weather, WeatherType } from "#app/data/weather.js";
+import { PlayerPokemon } from "#app/field/pokemon.js";
+import { MoveEffectPhase, TurnEndPhase } from "#app/phases.js";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 import GameManager from "../utils/gameManager";
-import Overrides from "#app/overrides";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
 import { getMovePosition } from "../utils/gameManagerUtils";
-import { MoveEffectPhase, TurnEndPhase } from "#app/phases.js";
-import { allMoves } from "#app/data/move.js";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Weather, WeatherType } from "#app/data/weather.js";
-import { Type } from "#app/data/type.js";
-import { Biome } from "#enums/biome";
-import { PlayerPokemon } from "#app/field/pokemon.js";
 import { SPLASH_ONLY } from "../utils/testUtils";
 
 const TIMEOUT = 20 * 1000;
@@ -125,7 +124,7 @@ describe("Abilities - Protean", () => {
     "ability applies correctly even if the type has changed by another ability",
     async () => {
       game.override.moveset([Moves.TACKLE]);
-      vi.spyOn(Overrides, "PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.REFRIGERATE);
+      game.override.passiveAbility(Abilities.REFRIGERATE);
 
       await game.startBattle([Species.MAGIKARP]);
 
diff --git a/src/test/abilities/protean.test.ts b/src/test/abilities/protean.test.ts
index 65858ec947d..d02c87662cf 100644
--- a/src/test/abilities/protean.test.ts
+++ b/src/test/abilities/protean.test.ts
@@ -1,18 +1,17 @@
+import { allMoves } from "#app/data/move.js";
+import { Type } from "#app/data/type.js";
+import { Weather, WeatherType } from "#app/data/weather.js";
+import { PlayerPokemon } from "#app/field/pokemon.js";
+import { MoveEffectPhase, TurnEndPhase } from "#app/phases.js";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 import GameManager from "../utils/gameManager";
-import Overrides from "#app/overrides";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
 import { getMovePosition } from "../utils/gameManagerUtils";
-import { MoveEffectPhase, TurnEndPhase } from "#app/phases.js";
-import { allMoves } from "#app/data/move.js";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Weather, WeatherType } from "#app/data/weather.js";
-import { Type } from "#app/data/type.js";
-import { Biome } from "#enums/biome";
-import { PlayerPokemon } from "#app/field/pokemon.js";
 import { SPLASH_ONLY } from "../utils/testUtils";
 
 const TIMEOUT = 20 * 1000;
@@ -125,7 +124,7 @@ describe("Abilities - Protean", () => {
     "ability applies correctly even if the type has changed by another ability",
     async () => {
       game.override.moveset([Moves.TACKLE]);
-      vi.spyOn(Overrides, "PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.REFRIGERATE);
+      game.override.passiveAbility(Abilities.REFRIGERATE);
 
       await game.startBattle([Species.MAGIKARP]);
 
diff --git a/src/test/abilities/unseen_fist.test.ts b/src/test/abilities/unseen_fist.test.ts
index e1e16584bd9..2156c5eb588 100644
--- a/src/test/abilities/unseen_fist.test.ts
+++ b/src/test/abilities/unseen_fist.test.ts
@@ -1,12 +1,11 @@
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-import GameManager from "../utils/gameManager";
-import Overrides from "#app/overrides";
-import { Species } from "#enums/species";
+import { TurnEndPhase } from "#app/phases.js";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import GameManager from "../utils/gameManager";
 import { getMovePosition } from "../utils/gameManagerUtils";
-import { TurnEndPhase } from "#app/phases.js";
 
 const TIMEOUT = 20 * 1000;
 
@@ -49,7 +48,7 @@ describe("Abilities - Unseen Fist", () => {
   test(
     "ability does not apply if the source has Long Reach",
     () => {
-      vi.spyOn(Overrides, "PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.LONG_REACH);
+      game.override.passiveAbility(Abilities.LONG_REACH);
       testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, false);
     }, TIMEOUT
   );
diff --git a/src/test/moves/dragon_rage.test.ts b/src/test/moves/dragon_rage.test.ts
index 0ad5776009d..b38a6f16513 100644
--- a/src/test/moves/dragon_rage.test.ts
+++ b/src/test/moves/dragon_rage.test.ts
@@ -1,17 +1,16 @@
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
-import Overrides from "#app/overrides";
-import { TurnEndPhase } from "#app/phases";
-import { Moves } from "#enums/moves";
-import { getMovePosition } from "#app/test/utils/gameManagerUtils";
-import { Abilities } from "#enums/abilities";
-import { Species } from "#app/enums/species.js";
-import { Type } from "#app/data/type";
 import { BattleStat } from "#app/data/battle-stat";
-import { BattlerTagType } from "#enums/battler-tag-type";
+import { Type } from "#app/data/type";
+import { Species } from "#app/enums/species.js";
 import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import { modifierTypes } from "#app/modifier/modifier-type";
+import { TurnEndPhase } from "#app/phases";
+import GameManager from "#app/test/utils/gameManager";
+import { getMovePosition } from "#app/test/utils/gameManagerUtils";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { SPLASH_ONLY } from "../utils/testUtils";
 
 describe("Moves - Dragon Rage", () => {
@@ -41,7 +40,7 @@ describe("Moves - Dragon Rage", () => {
     game.override.starterSpecies(Species.SNORLAX);
     game.override.moveset([Moves.DRAGON_RAGE]);
     game.override.ability(Abilities.BALL_FETCH);
-    vi.spyOn(Overrides, "PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.BALL_FETCH);
+    game.override.passiveAbility(Abilities.BALL_FETCH);
     game.override.startingLevel(100);
 
     game.override.enemySpecies(Species.SNORLAX);
diff --git a/src/test/moves/fissure.test.ts b/src/test/moves/fissure.test.ts
index 9f6bfa81cf7..940c32e975a 100644
--- a/src/test/moves/fissure.test.ts
+++ b/src/test/moves/fissure.test.ts
@@ -1,14 +1,13 @@
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
-import Overrides from "#app/overrides";
-import { DamagePhase, TurnEndPhase } from "#app/phases";
-import { Moves } from "#enums/moves";
-import { getMovePosition } from "#app/test/utils/gameManagerUtils";
-import { Abilities } from "#enums/abilities";
+import { BattleStat } from "#app/data/battle-stat";
 import { Species } from "#app/enums/species.js";
 import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
-import { BattleStat } from "#app/data/battle-stat";
+import { DamagePhase, TurnEndPhase } from "#app/phases";
+import GameManager from "#app/test/utils/gameManager";
+import { getMovePosition } from "#app/test/utils/gameManagerUtils";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { SPLASH_ONLY } from "../utils/testUtils";
 
 describe("Moves - Fissure", () => {
@@ -35,7 +34,7 @@ describe("Moves - Fissure", () => {
 
     game.override.starterSpecies(Species.SNORLAX);
     game.override.moveset([Moves.FISSURE]);
-    vi.spyOn(Overrides, "PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.BALL_FETCH);
+    game.override.passiveAbility(Abilities.BALL_FETCH);
     game.override.startingLevel(100);
 
     game.override.enemySpecies(Species.SNORLAX);
diff --git a/src/test/moves/glaive_rush.test.ts b/src/test/moves/glaive_rush.test.ts
index 937573ded15..c6ead0ff372 100644
--- a/src/test/moves/glaive_rush.test.ts
+++ b/src/test/moves/glaive_rush.test.ts
@@ -33,7 +33,7 @@ describe("Moves - Glaive Rush", () => {
     game.override.enemyMoveset(Array(4).fill(Moves.GLAIVE_RUSH));
     game.override.starterSpecies(Species.KLINK);
     game.override.ability(Abilities.UNNERVE);
-    vi.spyOn(Overrides, "PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.FUR_COAT);
+    game.override.passiveAbility(Abilities.FUR_COAT);
     game.override.moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]);
   });
 
diff --git a/src/test/moves/spikes.test.ts b/src/test/moves/spikes.test.ts
index b227132a1d5..a19c28b2c1e 100644
--- a/src/test/moves/spikes.test.ts
+++ b/src/test/moves/spikes.test.ts
@@ -1,13 +1,12 @@
-import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest";
-import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
-import Overrides from "#app/overrides";
 import {
   CommandPhase
 } from "#app/phases";
+import GameManager from "#app/test/utils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 
 describe("Moves - Spikes", () => {
@@ -32,7 +31,7 @@ describe("Moves - Spikes", () => {
     game.override.enemyAbility(Abilities.HYDRATION);
     game.override.enemyPassiveAbility(Abilities.HYDRATION);
     game.override.ability(Abilities.HYDRATION);
-    vi.spyOn(Overrides, "PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.HYDRATION);
+    game.override.passiveAbility(Abilities.HYDRATION);
     game.override.startingWave(3);
     game.override.enemyMoveset([Moves.SPLASH,Moves.SPLASH,Moves.SPLASH,Moves.SPLASH]);
     game.override.moveset([Moves.SPIKES,Moves.SPLASH, Moves.ROAR]);