diff --git a/test/abilities/aura_break.test.ts b/test/abilities/aura_break.test.ts
index f88d7d875bf..5b2211d7b3c 100644
--- a/test/abilities/aura_break.test.ts
+++ b/test/abilities/aura_break.test.ts
@@ -24,11 +24,12 @@ describe("Abilities - Aura Break", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
-    game.override.moveset([Moves.MOONBLAST, Moves.DARK_PULSE, Moves.MOONBLAST, Moves.DARK_PULSE]);
-    game.override.enemyMoveset(Moves.SPLASH);
-    game.override.enemyAbility(Abilities.AURA_BREAK);
-    game.override.enemySpecies(Species.SHUCKLE);
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.MOONBLAST, Moves.DARK_PULSE])
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.AURA_BREAK)
+      .enemySpecies(Species.SHUCKLE);
   });
 
   it("reverses the effect of Fairy Aura", async () => {
diff --git a/test/abilities/synchronize.test.ts b/test/abilities/synchronize.test.ts
index 783201d7a5b..e781d55fe10 100644
--- a/test/abilities/synchronize.test.ts
+++ b/test/abilities/synchronize.test.ts
@@ -66,10 +66,7 @@ describe("Abilities - Synchronize", () => {
   });
 
   it("does not trigger when Pokemon is statused by Toxic Spikes", async () => {
-    game.override
-      .ability(Abilities.SYNCHRONIZE)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Array(4).fill(Moves.TOXIC_SPIKES));
+    game.override.ability(Abilities.SYNCHRONIZE).enemyAbility(Abilities.BALL_FETCH).enemyMoveset(Moves.TOXIC_SPIKES);
 
     await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
 
diff --git a/test/moves/chilly_reception.test.ts b/test/moves/chilly_reception.test.ts
index 56da5dd400c..fed7cd0a380 100644
--- a/test/moves/chilly_reception.test.ts
+++ b/test/moves/chilly_reception.test.ts
@@ -26,7 +26,7 @@ describe("Moves - Chilly Reception", () => {
     game.override
       .battleStyle("single")
       .moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE])
-      .enemyMoveset(Array(4).fill(Moves.SPLASH))
+      .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
       .ability(Abilities.BALL_FETCH);
   });
@@ -69,10 +69,7 @@ describe("Moves - Chilly Reception", () => {
 
   // enemy uses another move and weather doesn't change
   it("check case - enemy not selecting chilly reception doesn't change weather ", async () => {
-    game.override
-      .battleStyle("single")
-      .enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE])
-      .moveset(Array(4).fill(Moves.SPLASH));
+    game.override.battleStyle("single").enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE]).moveset(Moves.SPLASH);
 
     await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
 
@@ -87,7 +84,7 @@ describe("Moves - Chilly Reception", () => {
     game.override
       .battleStyle("single")
       .startingWave(8)
-      .enemyMoveset(Array(4).fill(Moves.CHILLY_RECEPTION))
+      .enemyMoveset(Moves.CHILLY_RECEPTION)
       .enemySpecies(Species.MAGIKARP)
       .moveset([Moves.SPLASH, Moves.THUNDERBOLT]);
 
diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts
index c6114db3ff1..f0b6a4cabc6 100644
--- a/test/moves/powder.test.ts
+++ b/test/moves/powder.test.ts
@@ -120,7 +120,7 @@ describe("Moves - Powder", () => {
   });
 
   it("should not prevent the target from thawing out with Flame Wheel", async () => {
-    game.override.enemyMoveset(Array(4).fill(Moves.FLAME_WHEEL)).enemyStatusEffect(StatusEffect.FREEZE);
+    game.override.enemyMoveset(Moves.FLAME_WHEEL).enemyStatusEffect(StatusEffect.FREEZE);
 
     await game.classicMode.startBattle([Species.CHARIZARD]);
 
@@ -198,7 +198,7 @@ describe("Moves - Powder", () => {
   });
 
   it("should cancel Revelation Dance if it becomes a Fire-type move", async () => {
-    game.override.enemySpecies(Species.CHARIZARD).enemyMoveset(Array(4).fill(Moves.REVELATION_DANCE));
+    game.override.enemySpecies(Species.CHARIZARD).enemyMoveset(Moves.REVELATION_DANCE);
 
     await game.classicMode.startBattle([Species.CHARIZARD]);
 
@@ -212,7 +212,7 @@ describe("Moves - Powder", () => {
   });
 
   it("should cancel Shell Trap and damage the target, even if the move would fail", async () => {
-    game.override.enemyMoveset(Array(4).fill(Moves.SHELL_TRAP));
+    game.override.enemyMoveset(Moves.SHELL_TRAP);
 
     await game.classicMode.startBattle([Species.CHARIZARD]);
 
diff --git a/test/moves/throat_chop.test.ts b/test/moves/throat_chop.test.ts
index aaae9c0f5bb..8e504633707 100644
--- a/test/moves/throat_chop.test.ts
+++ b/test/moves/throat_chop.test.ts
@@ -23,11 +23,11 @@ describe("Moves - Throat Chop", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset(Array(4).fill(Moves.GROWL))
+      .moveset(Moves.GROWL)
       .battleStyle("single")
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Array(4).fill(Moves.THROAT_CHOP))
+      .enemyMoveset(Moves.THROAT_CHOP)
       .enemySpecies(Species.MAGIKARP);
   });