Index: Core/Common/test/Core.Common.TestUtils/TestDataPath.cs
===================================================================
diff -u -ra483049c20ef6d26addd0718d0f31ae1922e6f49 -r8fe209f0e949bff16607d1631a74bd428fee3f62
--- Core/Common/test/Core.Common.TestUtils/TestDataPath.cs	(.../TestDataPath.cs)	(revision a483049c20ef6d26addd0718d0f31ae1922e6f49)
+++ Core/Common/test/Core.Common.TestUtils/TestDataPath.cs	(.../TestDataPath.cs)	(revision 8fe209f0e949bff16607d1631a74bd428fee3f62)
@@ -20,9 +20,9 @@
             public static readonly TestDataPath DelftToolsUtilsTests =
                 System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Utils.Tests");
 
-            public static class DelftTools
+            public static class Base
             {
-                public static readonly TestDataPath DelftToolsTests = @"Core/Common/test/Core.Common.DelftTools.Tests";
+                public static readonly TestDataPath DelftToolsTests = @"Core/Common/test/Core.Common.Base.Tests";
             }
         }
 
Index: Core/Common/test/Core.Common.Utils.Tests/IO/ZipFileTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r8fe209f0e949bff16607d1631a74bd428fee3f62
--- Core/Common/test/Core.Common.Utils.Tests/IO/ZipFileTest.cs	(.../ZipFileTest.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/test/Core.Common.Utils.Tests/IO/ZipFileTest.cs	(.../ZipFileTest.cs)	(revision 8fe209f0e949bff16607d1631a74bd428fee3f62)
@@ -14,7 +14,7 @@
         public void ExtractFromZipFile()
         {
             File.Delete("LogoNLMW.xml");
-            ZipFileUtils.Extract(TestHelper.GetTestDataPath(TestDataPath.Common.DelftTools.DelftToolsTests, @"zipfile\") + "MetaData.zip", ".");
+            ZipFileUtils.Extract(TestHelper.GetTestDataPath(TestDataPath.Common.Base.DelftToolsTests, @"zipfile\") + "MetaData.zip", ".");
             Assert.IsTrue(File.Exists("LogoNLMW.xml"));
         }
 
Index: Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r8fe209f0e949bff16607d1631a74bd428fee3f62
--- Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 8fe209f0e949bff16607d1631a74bd428fee3f62)
@@ -34,7 +34,7 @@
         public void TestPredefinedTestPath()
         {
             //common
-            var path = TestHelper.GetTestDataPath(TestDataPath.Common.DelftTools.DelftToolsTests);
+            var path = TestHelper.GetTestDataPath(TestDataPath.Common.Base.DelftToolsTests);
             Assert.IsTrue(Directory.Exists(path));
 
             //deltashell