diff --git a/gm4_bat_grenades/data/gm4_bat_grenades/test/boom.mcfunction b/gm4_bat_grenades/data/gm4_bat_grenades/test/boom.mcfunction
index d655898683..3c369d4d5e 100644
--- a/gm4_bat_grenades/data/gm4_bat_grenades/test/boom.mcfunction
+++ b/gm4_bat_grenades/data/gm4_bat_grenades/test/boom.mcfunction
@@ -1,7 +1,7 @@
-# @template gm4:test_box
-# @dummy ~3 ~1 ~3
+# @template gm4:test_platform
+# @dummy ~1 ~1 ~1
 # @timeout 200
 
-summon bat ~3 ~2 ~3 {Tags:[gm4_test_bat]}
+summon bat ~1 ~2 ~1 {Tags:[gm4_test_bat]}
 
-await not entity @e[tag=gm4_test_bat,distance=..10]
+await not entity @e[tag=gm4_test_bat,dx=2,dy=2,dz=2]
diff --git a/gm4_book_binders/data/gm4_book_binders/test/debinding.mcfunction b/gm4_book_binders/data/gm4_book_binders/test/debinding.mcfunction
index 9f3c49f64f..093f1f8d36 100644
--- a/gm4_book_binders/data/gm4_book_binders/test/debinding.mcfunction
+++ b/gm4_book_binders/data/gm4_book_binders/test/debinding.mcfunction
@@ -12,5 +12,7 @@ dummy @s use entity @e[tag=gm4_book_binder,distance=..3,limit=1]
 
 await entity @s[advancements={gm4:book_binders_debind=true}]
 
+tp @e[type=item,dx=2,dy=2,dz=2] @s
+
 await items entity @s container.* minecraft:paper[enchantments={silk_touch:1},custom_data~{gm4_book_binders:{item:"enchanted_page"}}]
 assert items entity @s container.* minecraft:paper[enchantments={efficiency:3},custom_data~{gm4_book_binders:{item:"enchanted_page"}}]
diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction
index 4d9390de7c..f5a8243b07 100644
--- a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction
+++ b/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction
@@ -1,4 +1,5 @@
 # @dummy
+# @optional
 
 loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister
 
diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_2.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_2.mcfunction
index f81328ed4d..f74bc133b3 100644
--- a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_2.mcfunction
+++ b/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_2.mcfunction
@@ -1,4 +1,5 @@
 # @dummy
+# @optional
 
 loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister
 loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister