diff --git a/ProjectPlugins/CodexPlugin/CodexNode.cs b/ProjectPlugins/CodexPlugin/CodexNode.cs
index 38b8d418..36fb1dc0 100644
--- a/ProjectPlugins/CodexPlugin/CodexNode.cs
+++ b/ProjectPlugins/CodexPlugin/CodexNode.cs
@@ -73,7 +73,7 @@ namespace CodexPlugin
 
         public string GetName()
         {
-            return CodexAccess.Container.Name;
+            return Container.Name;
         }
 
         public DebugInfo GetDebugInfo()
diff --git a/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs b/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs
index 2ff5103d..3c4e4822 100644
--- a/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs
+++ b/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs
@@ -7,10 +7,14 @@ namespace CodexTests.ScalabilityTests
     public class MultiPeerDownloadTests : AutoBootstrapDistTest
     {
         [Test]
-        public void MultiPeerDownload()
+        [Combinatorial]
+        public void MultiPeerDownload(
+            [Values(5, 10, 20)] int numberOfHosts,
+            [Values(100, 1000)] int fileSize
+        )
         {
-            var hosts = AddCodex(5, s => s.WithLogLevel(CodexPlugin.CodexLogLevel.Trace));
-            var file = GenerateTestFile(100.MB());
+            var hosts = AddCodex(numberOfHosts, s => s.WithLogLevel(CodexPlugin.CodexLogLevel.Trace));
+            var file = GenerateTestFile(fileSize.MB());
             var cid = hosts[0].UploadFile(file);
 
             var uploadLog = Ci.DownloadLog(hosts[0]);