diff --git a/test_suites/collection_edit/src/CollectionEditTestInitializer.cs b/test_suites/collection_edit/src/CollectionEditTestInitializer.cs
index 7bb2bac..26c3aeb 100644
--- a/test_suites/collection_edit/src/CollectionEditTestInitializer.cs
+++ b/test_suites/collection_edit/src/CollectionEditTestInitializer.cs
@@ -19,7 +19,7 @@ namespace Mods.CollectionEditTest
 
             queued = true;
             GameLogger.Log("TEST", "CollectionEditTest: activating");
-            (Godot.Engine.GetMainLoop() as SceneTree)?.Root?.CallDeferred("add_child", new CollectionEditTestDriverNode());
+            ModRoot.AddDeferred(new CollectionEditTestDriverNode());
         }
     }
 }
diff --git a/test_suites/display_settings/src/DisplaySettingsTestInitializer.cs b/test_suites/display_settings/src/DisplaySettingsTestInitializer.cs
index 4e85837..f4460ac 100644
--- a/test_suites/display_settings/src/DisplaySettingsTestInitializer.cs
+++ b/test_suites/display_settings/src/DisplaySettingsTestInitializer.cs
@@ -27,7 +27,7 @@ namespace Mods.DisplaySettingsTest
 
             queued = true;
             GameLogger.Log("TEST", "DisplaySettingsTest: activating");
-            (Godot.Engine.GetMainLoop() as SceneTree)?.Root?.CallDeferred("add_child", new DisplaySettingsTestDriverNode(shots));
+            ModRoot.AddDeferred(new DisplaySettingsTestDriverNode(shots));
         }
     }
 }
diff --git a/test_suites/hot_reload/src/HotReloadTestInitializer.cs b/test_suites/hot_reload/src/HotReloadTestInitializer.cs
index f8e26bc..2538687 100644
--- a/test_suites/hot_reload/src/HotReloadTestInitializer.cs
+++ b/test_suites/hot_reload/src/HotReloadTestInitializer.cs
@@ -19,7 +19,7 @@ namespace Mods.HotReloadTest
 
             queued = true;
             GameLogger.Log("TEST", "HotReloadTest: activating");
-            (Godot.Engine.GetMainLoop() as SceneTree)?.Root?.CallDeferred("add_child", new HotReloadTestDriverNode());
+            ModRoot.AddDeferred(new HotReloadTestDriverNode());
         }
     }
 }
diff --git a/test_suites/menu_flow/src/MenuFlowTestInitializer.cs b/test_suites/menu_flow/src/MenuFlowTestInitializer.cs
index ed00735..39985f3 100644
--- a/test_suites/menu_flow/src/MenuFlowTestInitializer.cs
+++ b/test_suites/menu_flow/src/MenuFlowTestInitializer.cs
@@ -19,7 +19,7 @@ namespace Mods.MenuFlowTest
 
             queued = true;
             GameLogger.Log("TEST", "MenuFlowTest: activating");
-            (Godot.Engine.GetMainLoop() as SceneTree)?.Root?.CallDeferred("add_child", new MenuFlowTestDriverNode());
+            ModRoot.AddDeferred(new MenuFlowTestDriverNode());
         }
     }
 }
diff --git a/test_suites/new_game/src/NewGameTestInitializer.cs b/test_suites/new_game/src/NewGameTestInitializer.cs
index 64e274c..b014ea9 100644
--- a/test_suites/new_game/src/NewGameTestInitializer.cs
+++ b/test_suites/new_game/src/NewGameTestInitializer.cs
@@ -19,7 +19,7 @@ namespace Mods.NewGameTest
 
             queued = true;
             GameLogger.Log("TEST", "NewGameTest: activating");
-            (Godot.Engine.GetMainLoop() as SceneTree)?.Root?.CallDeferred("add_child", new NewGameTestDriverNode());
+            ModRoot.AddDeferred(new NewGameTestDriverNode());
         }
     }
 }
diff --git a/test_suites/save_dormancy/src/SaveDormancyTestInitializer.cs b/test_suites/save_dormancy/src/SaveDormancyTestInitializer.cs
index cd613b6..000741c 100644
--- a/test_suites/save_dormancy/src/SaveDormancyTestInitializer.cs
+++ b/test_suites/save_dormancy/src/SaveDormancyTestInitializer.cs
@@ -19,7 +19,7 @@ namespace Mods.SaveDormancyTest
 
             queued = true;
             GameLogger.Log("TEST", "SaveDormancyTest: activating");
-            (Godot.Engine.GetMainLoop() as SceneTree)?.Root?.CallDeferred("add_child", new SaveDormancyTestDriverNode());
+            ModRoot.AddDeferred(new SaveDormancyTestDriverNode());
         }
     }
 }