diff --git a/Tests/CodexReleaseTests/DataTests/TheseusTest.cs b/Tests/CodexReleaseTests/DataTests/TheseusTest.cs
index 6b576276..eb46cfde 100644
--- a/Tests/CodexReleaseTests/DataTests/TheseusTest.cs
+++ b/Tests/CodexReleaseTests/DataTests/TheseusTest.cs
@@ -22,9 +22,13 @@ namespace CodexReleaseTests.DataTests
         [Test]
         [Combinatorial]
         public void Theseus(
+            [Values(1, 2, 5)] int remainingNodes,
             [Values(10)] int steps)
         {
-            nodes.AddRange(StartCodex(3));
+            Assert.That(remainingNodes, Is.GreaterThan(0));
+            Assert.That(steps, Is.GreaterThan(remainingNodes + 1));
+
+            nodes.AddRange(StartCodex(remainingNodes + 1));
             cid = nodes.First().UploadFile(file);
 
             AllNodesHaveFile();
diff --git a/Tests/DistTestCore/NameUtils.cs b/Tests/DistTestCore/NameUtils.cs
index c742ceec..10a4c498 100644
--- a/Tests/DistTestCore/NameUtils.cs
+++ b/Tests/DistTestCore/NameUtils.cs
@@ -32,7 +32,7 @@ namespace DistTestCore
             if (fullName.Contains("AdhocContext")) return "none";
             var name = fullName.Substring(0, fullName.LastIndexOf('.'));
             name += FormatArguments(test);
-            return name.Replace('.', '-').Replace(',', '-');
+            return ReplaceInvalidCharacters(name);
         }
 
         public static string GetCategoryName()
@@ -80,7 +80,10 @@ namespace DistTestCore
                 .Replace("-dist-tests", "")
                 .Replace(":", "_")
                 .Replace("/", "_")
-                .Replace("\\", "_");
+                .Replace("\\", "_")
+                .Replace("\"", "")
+                .Replace('.', '-')
+                .Replace(',', '-');
         }
 
         private static string DetermineFolder(LogConfig config, DateTime start)