diff --git a/Tests/BasicTests/DownloadTests.cs b/Tests/BasicTests/DownloadTests.cs
new file mode 100644
index 0000000..bba4da1
--- /dev/null
+++ b/Tests/BasicTests/DownloadTests.cs
@@ -0,0 +1,51 @@
+using DistTestCore;
+using KubernetesWorkflow;
+using NUnit.Framework;
+namespace Tests.ParallelTests
+{
+    [TestFixture]
+    public class DownloadTests : DistTest
+    {
+        [Test]
+        public void ThreeNodeDownloads()
+        {
+            ParallelDownload(3, 5000.MB());
+        }
+        [Test]
+        public void FiveNodeDownloads()
+        {
+            ParallelDownload(5, 1000.MB());
+        }
+        [Test]
+        public void TenNodeDownloads()
+        {
+            ParallelDownload(10, 256.MB());
+        }
+
+        void ParallelDownload(int numberOfNodes, ByteSize filesize)
+        {
+            var group = SetupCodexNodes(numberOfNodes).BringOnline();
+            var host = SetupCodexNodes(1).BringOnline()[0];
+
+            foreach (var node in group)
+            {
+                host.ConnectToPeer(node);
+            }
+
+            var testFile = GenerateTestFile(filesize);
+            var contentId = host.UploadFile(testFile);
+            var list = new List<Task<TestFile?>>();
+            
+            foreach (var node in group)
+            {
+                list.Add(Task.Run(() => { return node.DownloadContent(contentId); }));
+            }
+
+            Task.WaitAll(list.ToArray());
+            foreach (var task in list)
+            {
+                testFile.AssertIsEqual(task.Result);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/BasicTests/ParallelTests.cs b/Tests/BasicTests/ParallelTests.cs
index b1701bc..a603524 100644
--- a/Tests/BasicTests/ParallelTests.cs
+++ b/Tests/BasicTests/ParallelTests.cs
@@ -3,52 +3,6 @@ using KubernetesWorkflow;
 using NUnit.Framework;
 namespace Tests.ParallelTests
 {
-    [TestFixture]
-    public class DownloadTests : DistTest
-    {
-        [Test]
-        public void ThreeNodeDownloads()
-        {
-            ParallelDownload(3, 5000.MB());
-        }
-        [Test]
-        public void FiveNodeDownloads()
-        {
-            ParallelDownload(5, 1000.MB());
-        }
-        [Test]
-        public void TenNodeDownloads()
-        {
-            ParallelDownload(10, 256.MB());
-        }
-
-        void ParallelDownload(int numberOfNodes, ByteSize filesize)
-        {
-            var group = SetupCodexNodes(numberOfNodes).BringOnline();
-            var host = SetupCodexNodes(1).BringOnline()[0];
-
-            foreach (var node in group)
-            {
-                host.ConnectToPeer(node);
-            }
-
-            var testFile = GenerateTestFile(filesize);
-            var contentId = host.UploadFile(testFile);
-            var list = new List<Task<TestFile?>>();
-            
-            foreach (var node in group)
-            {
-                list.Add(Task.Run(() => { return node.DownloadContent(contentId); }));
-            }
-
-            Task.WaitAll(list.ToArray());
-            foreach (var task in list)
-            {
-                testFile.AssertIsEqual(task.Result);
-            }
-        }
-    }
-
     [TestFixture]
     public class UploadTests : DistTest
     {
@@ -99,19 +53,4 @@ namespace Tests.ParallelTests
             }
         }
     }
-    [TestFixture]
-    public class MixedTests : DistTest
-    {
-        [Test]
-        public void OneDownloadOneUpload()
-        {
-        }
-
-        public void ThreeDownloadTwoUpload()
-        {
-        }
-        public void FiveDownloadFiveUpload()
-        {
-        }
-    }
 }
\ No newline at end of file