Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs
===================================================================
diff -u -rfb6ca0c708e591684db8b4e877ec4c38b094b5c9 -rded1b186659e737c88f38e470080872ec92d8f0a
--- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision fb6ca0c708e591684db8b4e877ec4c38b094b5c9)
+++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision ded1b186659e737c88f38e470080872ec92d8f0a)
@@ -209,8 +209,6 @@
             path = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Storage);
             Assert.IsTrue(Directory.Exists(path));
 
-            path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Gui);
-            Assert.IsTrue(Directory.Exists(path));
             path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Util);
             Assert.IsTrue(Directory.Exists(path));
             path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.IO);
@@ -252,8 +250,6 @@
 
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO);
             Assert.IsTrue(Directory.Exists(path));
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.Plugin);
-            Assert.IsTrue(Directory.Exists(path));
 
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.StabilityStoneCover.IO);
             Assert.IsTrue(Directory.Exists(path));
Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rded1b186659e737c88f38e470080872ec92d8f0a
--- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision ded1b186659e737c88f38e470080872ec92d8f0a)
@@ -53,10 +53,8 @@
         {
             public static class Common
             {
-                public static readonly TestDataPath Gui = System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Gui.Test");
                 public static readonly TestDataPath Util = System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Util.Test");
                 public static readonly TestDataPath IO = System.IO.Path.Combine("Core", "Common", "test", "Core.Common.IO.Test");
-                public static readonly TestDataPath TestUtil = System.IO.Path.Combine("Core", "Common", "test", "Core.Common.TestUtil.Test");
             }
 
             public static class Components
@@ -81,11 +79,6 @@
                 public static readonly TestDataPath Service = System.IO.Path.Combine("Ringtoets", "Common", "test", "Ringtoets.Common.Service.Test");
             }
 
-            public static class DuneErosion
-            {
-                public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "DuneErosion", "test", "Ringtoets.DuneErosion.IO.Test");
-            }
-
             public static class GrassCoverErosionInwards
             {
                 public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "GrassCoverErosionInwards", "test", "Ringtoets.GrassCoverErosionInwards.IO.Test");
@@ -118,13 +111,11 @@
             public static class MacroStabilityInwards
             {
                 public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "MacroStabilityInwards", "test", "Ringtoets.MacroStabilityInwards.IO.Test");
-                public static readonly TestDataPath Plugin = System.IO.Path.Combine("Ringtoets", "MacroStabilityInwards", "test", "Ringtoets.MacroStabilityInwards.Plugin.Test");
             }
 
             public static class Piping
             {
                 public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "Piping", "test", "Ringtoets.Piping.IO.Test");
-                public static readonly TestDataPath Plugin = System.IO.Path.Combine("Ringtoets", "Piping", "test", "Ringtoets.Piping.Plugin.Test");
             }
 
             public static class Revetment
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rded1b186659e737c88f38e470080872ec92d8f0a
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision ded1b186659e737c88f38e470080872ec92d8f0a)
@@ -486,6 +486,7 @@
 
             const string name = @"someName";
             const string url = @"someUrl";
+            const string noConfigFolderName = "noConfig";
 
             DialogBoxHandler = (formName, wnd) =>
             {
@@ -505,8 +506,9 @@
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "noConfig")
+                ApplicationLocalUserSettingsDirectory = Path.Combine(TestHelper.GetScratchPadPath(), noConfigFolderName)
             }))
+            using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), noConfigFolderName))
             using (new FileDisposeHelper(Path.Combine(SettingsHelper.Instance.GetApplicationLocalUserSettingsDirectory(),
                                                       wmtsconnectioninfoConfigFile)))
             using (new UseCustomTileSourceFactoryConfig(tileFactory))
@@ -589,6 +591,7 @@
 
             const string name = @"someName";
             const string url = @"someUrl";
+            const string noConfigFolderName = "noConfig";
 
             DialogBoxHandler = (formName, wnd) =>
             {
@@ -608,8 +611,9 @@
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "noConfig")
+                ApplicationLocalUserSettingsDirectory = Path.Combine(TestHelper.GetScratchPadPath(), noConfigFolderName)
             }))
+            using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), noConfigFolderName))
             {
                 string configFilePath = Path.Combine(SettingsHelper.Instance.GetApplicationLocalUserSettingsDirectory(),
                                                      wmtsconnectioninfoConfigFile);
@@ -906,6 +910,7 @@
                 Assert.IsNull(actual);
                 return;
             }
+
             var actualWmtsMapData = (WmtsMapData) actual;
             Assert.AreEqual(expected.Name, actualWmtsMapData.Name);
             Assert.AreEqual(expected.PreferredFormat, actualWmtsMapData.PreferredFormat);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineMetaImporterTest.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -rded1b186659e737c88f38e470080872ec92d8f0a
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineMetaImporterTest.cs	(.../ReferenceLineMetaImporterTest.cs)	(revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineMetaImporterTest.cs	(.../ReferenceLineMetaImporterTest.cs)	(revision ded1b186659e737c88f38e470080872ec92d8f0a)
@@ -109,15 +109,18 @@
         public void Constructor_EmptyFolder_ThrowsCriticalFileReadException()
         {
             // Setup
-            string pathToEmptyFolder = Path.Combine(testDataPath, "EmptyFolder");
+            string pathToEmptyFolder = Path.Combine(TestHelper.GetScratchPadPath(), "EmptyReferenceLineFolder");
 
             // Call
-            TestDelegate call = () => new ReferenceLineMetaImporter(pathToEmptyFolder);
+            using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), pathToEmptyFolder))
+            {
+                TestDelegate call = () => new ReferenceLineMetaImporter(pathToEmptyFolder);
 
-            // Assert
-            string expectedExceptionMessage = $@"Geen shapebestand om trajecten te specificeren gevonden in de map '{pathToEmptyFolder}'.";
-            var exception = Assert.Throws<CriticalFileReadException>(call);
-            Assert.AreEqual(expectedExceptionMessage, exception.Message);
+                // Assert
+                string expectedExceptionMessage = $@"Geen shapebestand om trajecten te specificeren gevonden in de map '{pathToEmptyFolder}'.";
+                var exception = Assert.Throws<CriticalFileReadException>(call);
+                Assert.AreEqual(expectedExceptionMessage, exception.Message);
+            }
         }
 
         [Test]