diff --git a/src/test/moves/dynamax_cannon.test.ts b/src/test/moves/dynamax_cannon.test.ts
index cdf8372b8a4..6535332fbd3 100644
--- a/src/test/moves/dynamax_cannon.test.ts
+++ b/src/test/moves/dynamax_cannon.test.ts
@@ -2,37 +2,18 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite
 import Phaser from "phaser";
 import GameManager from "#app/test/utils/gameManager";
 import overrides from "#app/overrides";
-import { MoveEffectPhase } from "#app/phases";
+import { MoveEffectPhase, DamagePhase, TurnStartPhase } from "#app/phases";
 import { getMovePosition } from "#app/test/utils/gameManagerUtils";
-import { Stat } from "#app/data/pokemon-stat";
-import { applyMoveAttrs, VariablePowerAttr } from "#app/data/move";
-import * as Utils from "#app/utils";
+import { allMoves } from "#app/data/move";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
+import { BattlerIndex } from "#app/battle";
 
 describe("Moves - Dynamax Cannon", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  /**
-   * Checks the base power of the {@linkcode intendedMove} before and after any
-   * {@linkcode VariablePowerAttr}s have been applied.
-   * @param phase current {@linkcode MoveEffectPhase}
-   * @param intendedMove Expected move during this {@linkcode phase}
-   * @param before Expected base power before any base power changes
-   * @param after Expected base power after any base power changes
-   */
-  const checkBasePowerChanges = (phase: MoveEffectPhase, intendedMove: Moves, before: number, after: number) => {
-    // Double check if the intended move was used and verify its initial base power
-    const move = phase.move.getMove();
-    expect(move.id).toBe(intendedMove);
-    expect(move.power).toBe(before);
-
-    /** Mocking application of {@linkcode VariablePowerAttr} */
-    const power = new Utils.IntegerHolder(move.power);
-    applyMoveAttrs(VariablePowerAttr, phase.getUserPokemon(), phase.getTarget(), move, power);
-    expect(power.value).toBe(after);
-  };
+  const dynamaxCannon = allMoves[Moves.DYNAMAX_CANNON];
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -46,156 +27,149 @@ describe("Moves - Dynamax Cannon", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    const moveToUse = Moves.DYNAMAX_CANNON;
+
+    vi.spyOn(overrides, "MOVESET_OVERRIDE", "get").mockReturnValue([ dynamaxCannon.id ]);
+    vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(200);
 
     // Note that, for Waves 1-10, the level cap is 10
     vi.spyOn(overrides, "STARTING_WAVE_OVERRIDE", "get").mockReturnValue(1);
     vi.spyOn(overrides, "SINGLE_BATTLE_OVERRIDE", "get").mockReturnValue(true);
-    vi.spyOn(overrides, "OPP_SPECIES_OVERRIDE", "get").mockReturnValue(Species.MAGIKARP);
-    vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(200);
-    vi.spyOn(overrides, "MOVESET_OVERRIDE", "get").mockReturnValue([ moveToUse ]);
-    vi.spyOn(overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]);
     vi.spyOn(overrides, "NEVER_CRIT_OVERRIDE", "get").mockReturnValue(true);
+
+    vi.spyOn(overrides, "OPP_SPECIES_OVERRIDE", "get").mockReturnValue(Species.MAGIKARP);
+    vi.spyOn(overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]);
+
+    vi.spyOn(dynamaxCannon, "calculateBattlePower");
   });
 
-  it("DYNAMAX CANNON against enemy below level cap", async() => {
+  it("should return 100 power against an enemy below level cap", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(1);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
-    checkBasePowerChanges(game.scene.getCurrentPhase() as MoveEffectPhase, moveToUse, 100, 100);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(dynamaxCannon.id);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(100);
   }, 20000);
 
-  it("DYNAMAX CANNON against enemy exactly at level cap", async() => {
+  it("should return 100 power against an enemy at level cap", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(10);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
-    checkBasePowerChanges(game.scene.getCurrentPhase() as MoveEffectPhase, moveToUse, 100, 100);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(dynamaxCannon.id);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(100);
   }, 20000);
 
-  it("DYNAMAX CANNON against enemy exactly at 1% above level cap", async() => {
+  it("should return 120 power against an enemy 1% above level cap", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(101);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-
-    const target = phase.getTarget();
-    // Force level cap to be 100; that is, level cap is no longer 10
-    target.scene.getMaxExpLevel = vi.fn().mockReturnValue(100);
-
-    checkBasePowerChanges(phase, moveToUse, 100, 120);
+    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    // Force level cap to be 100
+    vi.spyOn(phase.getTarget().scene, "getMaxExpLevel").mockReturnValue(100);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(120);
   }, 20000);
 
-  it("DYNAMAX CANNON against enemy exactly at 2% above level cap", async() => {
+  it("should return 140 power against an enemy 2% above level capp", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(102);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-
-    const target = phase.getTarget();
-    target.scene.getMaxExpLevel = vi.fn().mockReturnValue(100);
-
-    checkBasePowerChanges(phase, moveToUse, 100, 140);
+    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    // Force level cap to be 100
+    vi.spyOn(phase.getTarget().scene, "getMaxExpLevel").mockReturnValue(100);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(140);
   }, 20000);
 
-  it("DYNAMAX CANNON against enemy exactly at 3% above level cap", async() => {
+  it("should return 160 power against an enemy 3% above level cap", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(103);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-
-    const target = phase.getTarget();
-    target.scene.getMaxExpLevel = vi.fn().mockReturnValue(100);
-
-    checkBasePowerChanges(phase, moveToUse, 100, 160);
+    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    // Force level cap to be 100
+    vi.spyOn(phase.getTarget().scene, "getMaxExpLevel").mockReturnValue(100);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(160);
   }, 20000);
 
-  it("DYNAMAX CANNON against enemy exactly at 4% above level cap", async() => {
+  it("should return 180 power against an enemy 4% above level cap", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(104);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-
-    const target = phase.getTarget();
-    target.scene.getMaxExpLevel = vi.fn().mockReturnValue(100);
-
-    checkBasePowerChanges(phase, moveToUse, 100, 180);
+    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    // Force level cap to be 100
+    vi.spyOn(phase.getTarget().scene, "getMaxExpLevel").mockReturnValue(100);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(180);
   }, 20000);
 
-  it("DYNAMAX CANNON against enemy exactly at 5% above level cap", async() => {
+  it("should return 200 power against an enemy 5% above level cap", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(105);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-
-    const target = phase.getTarget();
-    target.scene.getMaxExpLevel = vi.fn().mockReturnValue(100);
-
-    checkBasePowerChanges(phase, moveToUse, 100, 200);
+    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    // Force level cap to be 100
+    vi.spyOn(phase.getTarget().scene, "getMaxExpLevel").mockReturnValue(100);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
 
-  it("DYNAMAX CANNON against enemy way above level cap", async() => {
+  it("should return 200 power against an enemy way above level cap", async() => {
     vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(999);
-    const moveToUse = Moves.DYNAMAX_CANNON;
     await game.startBattle([
       Species.ETERNATUS,
     ]);
 
-    // Force enemy to go last
-    game.scene.getEnemyParty()[0].stats[Stat.SPD] = 1;
+    game.doAttack(getMovePosition(game.scene, 0, dynamaxCannon.id));
 
-    game.doAttack(getMovePosition(game.scene, 0, moveToUse));
+    await game.phaseInterceptor.to(TurnStartPhase, false);
+    // Force user to act before enemy
+    vi.spyOn((game.scene.getCurrentPhase() as TurnStartPhase), "getOrder").mockReturnValue([ BattlerIndex.PLAYER, BattlerIndex. ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-
-    checkBasePowerChanges(game.scene.getCurrentPhase() as MoveEffectPhase, moveToUse, 100, 200);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(dynamaxCannon.id);
+    await game.phaseInterceptor.to(DamagePhase, false);
+    expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
 });