diff --git a/Tests/CodexReleaseTests/Parallelism.cs b/Tests/CodexReleaseTests/Parallelism.cs
index cd0a4299..a1b26c73 100644
--- a/Tests/CodexReleaseTests/Parallelism.cs
+++ b/Tests/CodexReleaseTests/Parallelism.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-[assembly: LevelOfParallelism(10)]
+[assembly: LevelOfParallelism(1)]
 namespace CodexReleaseTests.DataTests
 {
 }
diff --git a/Tests/DistTestCore/Configuration.cs b/Tests/DistTestCore/Configuration.cs
index e7e50822..3fa34b5e 100644
--- a/Tests/DistTestCore/Configuration.cs
+++ b/Tests/DistTestCore/Configuration.cs
@@ -14,7 +14,7 @@ namespace DistTestCore
             kubeConfigFile = GetNullableEnvVarOrDefault("KUBECONFIG", null);
             logPath = GetEnvVarOrDefault("LOGPATH", "CodexTestLogs");
             dataFilesPath = GetEnvVarOrDefault("DATAFILEPATH", "TestDataFiles");
-            AlwaysDownloadContainerLogs = true; // !string.IsNullOrEmpty(GetEnvVarOrDefault("ALWAYS_LOGS", ""));
+            AlwaysDownloadContainerLogs = !string.IsNullOrEmpty(GetEnvVarOrDefault("ALWAYS_LOGS", ""));
         }
 
         public Configuration(string? kubeConfigFile, string logPath, string dataFilesPath)
diff --git a/Tests/DistTestCore/NameUtils.cs b/Tests/DistTestCore/NameUtils.cs
index dc529b5d..5e1f8a9f 100644
--- a/Tests/DistTestCore/NameUtils.cs
+++ b/Tests/DistTestCore/NameUtils.cs
@@ -55,12 +55,23 @@ namespace DistTestCore
         private static string FormatArguments(TestContext.TestAdapter test)
         {
             if (test.Arguments == null || !test.Arguments.Any()) return "";
-            return $"[{string.Join(',', test.Arguments)}]";
+            return $"[{string.Join(',', test.Arguments.Select(FormatArgument).ToArray())}]";
+        }
+        
+        private static string FormatArgument(object? obj)
+        {
+            if (obj == null) return "";
+            var str = obj.ToString();
+            if (string.IsNullOrEmpty(str)) return "";
+            return ReplaceInvalidCharacters(str);
         }
 
         private static string ReplaceInvalidCharacters(string name)
         {
-            return name.Replace(":", "_");
+            return name
+                .Replace(":", "_")
+                .Replace("/", "_")
+                .Replace("\\", "_");
         }
 
         private static string DetermineFolder(LogConfig config, DateTime start)