diff --git a/Duplicati/UnitTest/BasicSetupHelper.cs b/Duplicati/UnitTest/BasicSetupHelper.cs
index 19f67c818..a94bb561b 100644
--- a/Duplicati/UnitTest/BasicSetupHelper.cs
+++ b/Duplicati/UnitTest/BasicSetupHelper.cs
@@ -104,7 +104,7 @@ namespace Duplicati.UnitTest
             timer.Elapsed += delegate(object obj, ElapsedEventArgs e){
                 var nogc = GC.GetTotalMemory(false)/1000/1000;
                 var yesgc = GC.GetTotalMemory(true)/1000/1000;
-                TestContext.Progress.WriteLine("Memory: {0} -> {1}", nogc, yesgc);
+                TestContext.Progress.WriteLine("Memory: {0}MB -> {1}MB", nogc, yesgc);
             };
             timer.AutoReset = true;
             return timer;
@@ -115,7 +115,7 @@ namespace Duplicati.UnitTest
         public void BasicHelperSetUp()
         {
             memoryTimer.Enabled = true;
-            TestContext.Progress.WriteLine("Setup {0}", TestContext.CurrentContext.Test.Name);
+            TestContext.Progress.WriteLine("Setup {0} {1}MB", TestContext.CurrentContext.Test.Name, GC.GetTotalMemory(true)/1000/1000);
             systemIO.DirectoryCreate(this.DATAFOLDER);
             systemIO.DirectoryCreate(this.TARGETFOLDER);
             systemIO.DirectoryCreate(this.RESTOREFOLDER);  
@@ -126,7 +126,7 @@ namespace Duplicati.UnitTest
         {
             memoryTimer.Enabled = false;
             if( TestContext.CurrentContext.Test.MethodName != null){
-               TestContext.Progress.WriteLine("TearDown {0} {1}", TestContext.CurrentContext.Test.MethodName, GC.GetTotalMemory(true)/1000/1000);
+               TestContext.Progress.WriteLine("TearDown {0} {1}MB", TestContext.CurrentContext.Test.MethodName, GC.GetTotalMemory(true)/1000/1000);
             }
             if (systemIO.DirectoryExists(this.DATAFOLDER))
             {
diff --git a/Duplicati/UnitTest/CompressionTests.cs b/Duplicati/UnitTest/CompressionTests.cs
index 19e90d56d..327d5158b 100644
--- a/Duplicati/UnitTest/CompressionTests.cs
+++ b/Duplicati/UnitTest/CompressionTests.cs
@@ -23,7 +23,7 @@ using NUnit.Framework;
 namespace Duplicati.UnitTest
 {
     [Category("Compression")]
-    public class CompressionTests
+    public class CompressionTests : BasicSetupHelper
     {
         [TestCase("zip")]
         [TestCase("7z")]
diff --git a/Duplicati/UnitTest/DeleteHandlerTests.cs b/Duplicati/UnitTest/DeleteHandlerTests.cs
index e472ca401..a4f47ad92 100644
--- a/Duplicati/UnitTest/DeleteHandlerTests.cs
+++ b/Duplicati/UnitTest/DeleteHandlerTests.cs
@@ -9,7 +9,7 @@ using NUnit.Framework;
 
 namespace Duplicati.UnitTest
 {
-    public class DeleteHandlerTests
+    public class DeleteHandlerTests : BasicSetupHelper
     {
         private class Fileset : IListResultFileset, IEquatable<Fileset>
         {
diff --git a/Duplicati/UnitTest/IOTests.cs b/Duplicati/UnitTest/IOTests.cs
index 5c834c385..0ac436831 100644
--- a/Duplicati/UnitTest/IOTests.cs
+++ b/Duplicati/UnitTest/IOTests.cs
@@ -20,21 +20,21 @@ using NUnit.Framework;
 
 using Duplicati.Library.Common.IO;
 using Duplicati.Library.Utility;
-using Duplicati.Library.Common;
+using Duplicati.Library.Common;
 using System.Collections.Generic;
 
-namespace Duplicati.UnitTest
+namespace Duplicati.UnitTest
 {
     [Category("IO")]
-    public class IOTests
+    public class IOTests : BasicSetupHelper
     {
 
-        public static string LongPath(string pathRoot)
+        public static string LongPath(string pathRoot)
         {
             string subFolder = "test";
             return pathRoot + new StringBuilder().Insert(0, subFolder + Util.DirectorySeparatorString, 100);
         }
-
+
         [Test]
         public void TestGetPathRootWithLongPath()
         {
@@ -45,7 +45,7 @@ namespace Duplicati.UnitTest
         }
 
         [Test]
-        public void TestUncBehaviourOfGetPathRoot()
+        public void TestUncBehaviourOfGetPathRoot()
         {
             if (!Platform.IsClientWindows)
             {
@@ -88,7 +88,7 @@ namespace Duplicati.UnitTest
             var pathRoot = Platform.IsClientWindows ? "C:\\" : "/";
 
             var longPath = LongPath(pathRoot);
-            if (SystemIO.IO_OS.DirectoryExists(longPath))
+            if (SystemIO.IO_OS.DirectoryExists(longPath))
             {
                 return;
             }
@@ -96,9 +96,9 @@ namespace Duplicati.UnitTest
             //In particular don't throw PathTooLongException
             Assert.Throws<System.IO.DirectoryNotFoundException>(() => SystemIO.IO_OS.GetDirectories(longPath));
         }
-
+
         [Test]
-        public void TestAddExtendedDevicePathPrefixInWindowsClient()
+        public void TestAddExtendedDevicePathPrefixInWindowsClient()
         {
             if (!Platform.IsClientWindows)
             {
@@ -206,7 +206,7 @@ namespace Duplicati.UnitTest
         }
 
         [Test]
-        public void TestPathGetFullPathInWindowsClient()
+        public void TestPathGetFullPathInWindowsClient()
         {
             if (!Platform.IsClientWindows)
             {
@@ -277,7 +277,7 @@ namespace Duplicati.UnitTest
                 };
             foreach (var path in testCasesWherePathGetFullGivesSameResultsAsDotNet)
             {
-                var actual = SystemIO.IO_WIN.PathGetFullPath(path);
+                var actual = SystemIO.IO_WIN.PathGetFullPath(path); 
                 var expected = System.IO.Path.GetFullPath(path);
                 Assert.AreEqual(expected, actual, $"Path: {path}");
             }
diff --git a/Duplicati/UnitTest/ImportExportTests.cs b/Duplicati/UnitTest/ImportExportTests.cs
index 9d0a05c7a..13abdaa20 100644
--- a/Duplicati/UnitTest/ImportExportTests.cs
+++ b/Duplicati/UnitTest/ImportExportTests.cs
@@ -29,7 +29,7 @@ using Backup = Duplicati.Server.Database.Backup;
 
 namespace Duplicati.UnitTest
 {
-    public class ImportExportTests
+    public class ImportExportTests : BasicSetupHelper
     {
         private string serverDatafolder;
 
diff --git a/Duplicati/UnitTest/ResultFormatSerializerProviderTest.cs b/Duplicati/UnitTest/ResultFormatSerializerProviderTest.cs
index e99036a24..b9a61cc0a 100644
--- a/Duplicati/UnitTest/ResultFormatSerializerProviderTest.cs
+++ b/Duplicati/UnitTest/ResultFormatSerializerProviderTest.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 namespace Duplicati.UnitTest
 {
     [TestFixture]
-    public class ResultFormatSerializerProviderTest
+    public class ResultFormatSerializerProviderTest : BasicSetupHelper
     {
         [Test]
         [Category("Serialization")]
diff --git a/Duplicati/UnitTest/UriUtilityTests.cs b/Duplicati/UnitTest/UriUtilityTests.cs
index 8997ec934..d5e838e74 100644
--- a/Duplicati/UnitTest/UriUtilityTests.cs
+++ b/Duplicati/UnitTest/UriUtilityTests.cs
@@ -17,11 +17,11 @@
 
 using NUnit.Framework;
 using System.Collections.Specialized;
-
-namespace Duplicati.UnitTest
-{
-    public class UriUtilityTests
-    {
+
+namespace Duplicati.UnitTest
+{
+    public class UriUtilityTests : BasicSetupHelper
+    {
         [Test]
         [Category("UriUtility")]
         public static void TestBuildUriQuery()
@@ -65,5 +65,5 @@ namespace Duplicati.UnitTest
             Assert.AreEqual("/a", Library.Utility.UrlPath.Create(path1).Append(null).ToString());
             Assert.AreEqual("/b/", Library.Utility.UrlPath.Create(string.Empty).Append(path2).ToString());
         }
-    }
-}
+    }
+}
diff --git a/Duplicati/UnitTest/UtilityTests.cs b/Duplicati/UnitTest/UtilityTests.cs
index b0ce308e7..1779de033 100644
--- a/Duplicati/UnitTest/UtilityTests.cs
+++ b/Duplicati/UnitTest/UtilityTests.cs
@@ -27,7 +27,7 @@ using System.Threading.Tasks;
 
 namespace Duplicati.UnitTest
 {
-    public class UtilityTests
+    public class UtilityTests : BasicSetupHelper
     {
         [Test]
         [Category("Utility")]