diff --git a/test/item_effect_cure_status.c b/test/item_effect_cure_status.c
index 4d4cbda2e..949f60f0e 100644
--- a/test/item_effect_cure_status.c
+++ b/test/item_effect_cure_status.c
@@ -11,7 +11,7 @@ SINGLE_BATTLE_TEST("Cure Status: Paralyze Heal heals a battler from being paraly
         TURN { USE_ITEM(player, ITEM_PARALYZE_HEAL, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -26,7 +26,7 @@ SINGLE_BATTLE_TEST("Cure Status: Antidote heals a battler from being poisoned")
         TURN { USE_ITEM(player, ITEM_ANTIDOTE, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -41,7 +41,7 @@ SINGLE_BATTLE_TEST("Cure Status: Antidote heals a battler from being badly poiso
         TURN { USE_ITEM(player, ITEM_ANTIDOTE, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -56,7 +56,7 @@ SINGLE_BATTLE_TEST("Cure Status: Awakening heals a battler from being asleep")
         TURN { USE_ITEM(player, ITEM_AWAKENING, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -71,7 +71,7 @@ SINGLE_BATTLE_TEST("Cure Status: Burn Heal heals a battler from being burned")
         TURN { USE_ITEM(player, ITEM_BURN_HEAL, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -86,7 +86,7 @@ SINGLE_BATTLE_TEST("Cure Status: Ice Heal heals a battler from being paralyzed")
         TURN { USE_ITEM(player, ITEM_ICE_HEAL, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -108,7 +108,7 @@ SINGLE_BATTLE_TEST("Cure Status: Full Heal heals a battler from any primary stat
         TURN { USE_ITEM(player, ITEM_FULL_HEAL, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -130,7 +130,7 @@ SINGLE_BATTLE_TEST("Cure Status: Heal Powder heals a battler from any primary st
         TURN { USE_ITEM(player, ITEM_HEAL_POWDER, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -152,7 +152,7 @@ SINGLE_BATTLE_TEST("Cure Status: Pewter Crunchies heals a battler from any prima
         TURN { USE_ITEM(player, ITEM_PEWTER_CRUNCHIES, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -174,7 +174,7 @@ SINGLE_BATTLE_TEST("Cure Status: Lava Cookies heals a battler from any primary s
         TURN { USE_ITEM(player, ITEM_LAVA_COOKIE, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -196,7 +196,7 @@ SINGLE_BATTLE_TEST("Cure Status: Rage Candy Bar heals a battler from any primary
         TURN { USE_ITEM(player, ITEM_RAGE_CANDY_BAR, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -218,7 +218,7 @@ SINGLE_BATTLE_TEST("Cure Status: Old Gateu heals a battler from any primary stat
         TURN { USE_ITEM(player, ITEM_OLD_GATEAU, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -240,7 +240,7 @@ SINGLE_BATTLE_TEST("Cure Status: Casteliacone heals a battler from any primary s
         TURN { USE_ITEM(player, ITEM_CASTELIACONE, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -262,7 +262,7 @@ SINGLE_BATTLE_TEST("Cure Status: Lumiose Galette heals a battler from any primar
         TURN { USE_ITEM(player, ITEM_LUMIOSE_GALETTE, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");;
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -284,7 +284,7 @@ SINGLE_BATTLE_TEST("Cure Status: Shalour Sable heals a battler from any primary
         TURN { USE_ITEM(player, ITEM_SHALOUR_SABLE, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
@@ -306,12 +306,12 @@ SINGLE_BATTLE_TEST("Cure Status: Big Malasada heals a battler from any primary s
         TURN { USE_ITEM(player, ITEM_BIG_MALASADA, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
 }
 
-SINGLE_BATTLE_TEST("Cure Status: Full Heal and local specialties heal a battler from being confused")
+SINGLE_BATTLE_TEST("Cure Status: Full Heal, Heal Powder and Local Specialties heal a battler from being confused")
 {
     u16 item;
     PARAMETRIZE { item = ITEM_FULL_HEAL; }
@@ -333,7 +333,7 @@ SINGLE_BATTLE_TEST("Cure Status: Full Heal and local specialties heal a battler
         TURN { USE_ITEM(player, item, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its status healed!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->status2, STATUS1_NONE); // because we dont have STATUS2_NONE
     }
 }
diff --git a/test/item_effect_heal_and_cure_status.c b/test/item_effect_heal_and_cure_status.c
index 6e264d25a..17ac5be96 100644
--- a/test/item_effect_heal_and_cure_status.c
+++ b/test/item_effect_heal_and_cure_status.c
@@ -18,7 +18,7 @@ SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures any primary s
         TURN{ USE_ITEM(player, ITEM_FULL_RESTORE, partyIndex: 0); }
     } SCENE {
         MESSAGE("Wobbuffet had its HP restored!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->hp, player->maxHP);
         EXPECT_EQ(player->status1, STATUS1_NONE);
     }
@@ -37,7 +37,7 @@ SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures confusion")
     } SCENE {
         MESSAGE("Wobbuffet had its HP restored!");
         NONE_OF { MESSAGE("Wobbuffet is confused!"); }
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->hp, player->maxHP);
     }
 }
diff --git a/test/item_effect_revive.c b/test/item_effect_revive.c
index 695361892..3c6995176 100644
--- a/test/item_effect_revive.c
+++ b/test/item_effect_revive.c
@@ -3,24 +3,6 @@
 
 #define MAX_HP 200
 
-SINGLE_BATTLE_TEST("Revive: Super Potion restores a fainted battler's HP to half")
-{
-    GIVEN {
-        ASSUME(gItems[ITEM_SUPER_POTION].battleUsage == EFFECT_ITEM_RESTORE_HP);
-        PLAYER(SPECIES_WYNAUT) { HP(1); MaxHP(MAX_HP); }
-        PLAYER(SPECIES_WOBBUFFET);
-        OPPONENT(SPECIES_WOBBUFFET);
-    } WHEN {
-        TURN { MOVE(opponent, MOVE_TACKLE); SEND_OUT(player, 1); }
-        TURN { USE_ITEM(player, ITEM_SUPER_POTION, partyIndex: 0); }
-        TURN { SWITCH(player, 0); }
-    } SCENE {
-        MESSAGE("Wynaut had its HP restored!");
-    } FINALLY {
-        EXPECT_EQ(player->hp, 60);
-    }
-}
-
 SINGLE_BATTLE_TEST("Revive: Revive restores a fainted battler's HP to half")
 {
     GIVEN {
@@ -34,7 +16,7 @@ SINGLE_BATTLE_TEST("Revive: Revive restores a fainted battler's HP to half")
         TURN { SWITCH(player, 0); }
     } SCENE {
         MESSAGE("Wynaut had its HP restored!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->hp, MAX_HP/2);
     }
 }
@@ -52,7 +34,7 @@ SINGLE_BATTLE_TEST("Revive: Max Revive restores a fainted battler's HP fully")
         TURN { SWITCH(player, 0); }
     } SCENE {
         MESSAGE("Wynaut had its HP restored!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->hp, MAX_HP);
     }
 }
@@ -70,7 +52,7 @@ SINGLE_BATTLE_TEST("Revive: Revival Herb restores a fainted battler's HP fully")
         TURN { SWITCH(player, 0); }
     } SCENE {
         MESSAGE("Wynaut had its HP restored!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->hp, MAX_HP);
     }
 }
@@ -88,7 +70,7 @@ SINGLE_BATTLE_TEST("Revive: Max Honey restores a fainted battler's HP fully")
         TURN { SWITCH(player, 0); }
     } SCENE {
         MESSAGE("Wynaut had its HP restored!");
-    } FINALLY {
+    } THEN {
         EXPECT_EQ(player->hp, MAX_HP);
     }
 }