diff --git a/MultiversalDiplomacyTests/ReplTest.cs b/MultiversalDiplomacyTests/ReplTest.cs
index d6c6f46..5feed37 100644
--- a/MultiversalDiplomacyTests/ReplTest.cs
+++ b/MultiversalDiplomacyTests/ReplTest.cs
@@ -8,11 +8,13 @@ namespace MultiversalDiplomacyTests;
 
 public class ReplTest
 {
+    private static ReplDriver StandardRepl() => new(
+        new SetupScriptHandler(World.WithStandardMap(), strict: true));
+
     [Test]
     public void SetupHandler()
     {
-        SetupScriptHandler setup = new(World.WithStandardMap(), strict: true);
-        ReplDriver repl = new(setup);
+        var repl = StandardRepl();
 
         repl["""
         unit Germany A Munich
@@ -37,15 +39,13 @@ public class ReplTest
     [Test]
     public void SubmitOrders()
     {
-        SetupScriptHandler setup = new(World.WithStandardMap(), strict: true);
-        ReplDriver repl = new ReplDriver(setup)["""
+        var repl = StandardRepl();
+
+        repl["""
         unit Germany A Mun
         unit Austria A Tyr
         unit England F Lon
-        begin
-        """];
-
-        repl["""
+        ---
         Germany A Mun hold
         Austria: Army Tyrolia - Vienna
         England:
@@ -75,12 +75,15 @@ public class ReplTest
     [Test]
     public void AssertBasic()
     {
-        var repl = new ReplDriver(new SetupScriptHandler(World.WithStandardMap(), strict: true))["""
+        var repl = StandardRepl();
+
+        repl["""
         unit Germany A Munich
         ---
         ---
-        """];
-        repl["assert true"].AssertReady();
+        assert true
+        """].AssertReady();
+
         repl["assert false"].AssertClosed();
     }
 }