diff --git a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs
index bb884ac..5e84883 100644
--- a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs
+++ b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs
@@ -7,7 +7,7 @@ namespace CodexPlugin
 {
     public class CodexContainerRecipe : ContainerRecipeFactory
     {
-        private const string DefaultDockerImage = "codexstorage/nim-codex:sha-471ebb2-dist-tests";
+        private const string DefaultDockerImage = "codexstorage/nim-codex:sha-64b82de-dist-tests";
 
         public const string ApiPortTag = "codex_api_port";
         public const string ListenPortTag = "codex_listen_port";
diff --git a/Tests/DistTestCore/DistTest.cs b/Tests/DistTestCore/DistTest.cs
index 7f67082..cc44f53 100644
--- a/Tests/DistTestCore/DistTest.cs
+++ b/Tests/DistTestCore/DistTest.cs
@@ -13,7 +13,7 @@ namespace DistTestCore
     [Parallelizable(ParallelScope.All)]
     public abstract class DistTest
     {
-        private const string TestNamespacePrefix = "ct-";
+        private const string TestNamespacePrefix = "cdx-";
         private readonly Configuration configuration = new Configuration();
         private readonly Assembly[] testAssemblies;
         private readonly FixtureLog fixtureLog;
diff --git a/Tools/AutoClient/Program.cs b/Tools/AutoClient/Program.cs
index 5eed206..bc186f1 100644
--- a/Tools/AutoClient/Program.cs
+++ b/Tools/AutoClient/Program.cs
@@ -55,6 +55,8 @@ public static class Program
             await Task.Delay(delayPerPurchaser);
         }
 
+        cancellationToken.WaitHandle.WaitOne();
+
         log.Log("Done.");
     }
 
diff --git a/Tools/AutoClient/Purchaser.cs b/Tools/AutoClient/Purchaser.cs
index 3d03258..a9ec89c 100644
--- a/Tools/AutoClient/Purchaser.cs
+++ b/Tools/AutoClient/Purchaser.cs
@@ -12,19 +12,19 @@ namespace AutoClient
         private readonly HttpClient client;
         private readonly Address address;
         private readonly CodexApi codex;
-        private readonly CancellationToken ct;
         private readonly Configuration config;
         private readonly ImageGenerator generator;
+        private readonly CancellationToken ct;
 
-        public Purchaser(ILog log, HttpClient client, Address address, CodexApi codex, CancellationToken ct, Configuration config, ImageGenerator generator)
+        public Purchaser(ILog log, HttpClient client, Address address, CodexApi codex, Configuration config, ImageGenerator generator, CancellationToken ct)
         {
             this.log = log;
             this.client = client;
             this.address = address;
             this.codex = codex;
-            this.ct = ct;
             this.config = config;
             this.generator = generator;
+            this.ct = ct;
         }
 
         public void Start()