diff --git a/LNUnit.Tests/AbcLightningFixture.cs b/LNUnit.Tests/AbcLightningFixture.cs
index 692f67b..aff6f48 100644
--- a/LNUnit.Tests/AbcLightningFixture.cs
+++ b/LNUnit.Tests/AbcLightningFixture.cs
@@ -565,7 +565,7 @@ public async Task FailureReasonNoRoute()
         });
 
         "Carol shutdown".Print();
-        await Builder.ShutdownByAlias("carol", 0);
+        await Builder.ShutdownByAlias("carol", 0, true);
         await Task.Delay(1000);
         paymentTask.Status.PrintDump();
         Builder.CancelInterceptorOnAlias("bob");
@@ -666,7 +666,7 @@ public async Task GetPaymentFailureData()
         });
 
         "Carol shutdown".Print();
-        await Builder.ShutdownByAlias("carol", 0);
+        await Builder.ShutdownByAlias("carol", 0, true);
         await Task.Delay(1000);
         paymentTask.Status.PrintDump();
         Builder.CancelInterceptorOnAlias("bob");
@@ -683,7 +683,7 @@ public async Task GetPaymentFailureData()
         var res = new List<PaymentStats>();
 
         var consolidated = new Dictionary<string, (int Success, int Fail)>();
-        var client = (await Builder.GetLNDSettingsFromContainer("alice")).GetClient();
+        var client = (await Builder.GetLNDSettingsFromContainer("alice", _lndRoot)).GetClient();
         var payments = await client.LightningClient.ListPaymentsAsync(new ListPaymentsRequest
         {
             //CountTotalPayments = true,
diff --git a/LNUnit/Setup/LNUnitBuilder.cs b/LNUnit/Setup/LNUnitBuilder.cs
index ed40225..6fed7c8 100644
--- a/LNUnit/Setup/LNUnitBuilder.cs
+++ b/LNUnit/Setup/LNUnitBuilder.cs
@@ -672,7 +672,7 @@ public async Task<LNDNodeConnection> WaitUntilAliasIsServerReady(string alias)
         }
 
         while (!ready.IsServerReady) await Task.Delay(100);
-        return ready;
+        return ready.Clone();
     }
 
     public async Task<ChannelGraph> GetGraphFromAlias(string alias)