Index: Application/Ringtoets/test/Application.Ringtoets.Integration.Test/StorageMigrationIntegrationTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Application/Ringtoets/test/Application.Ringtoets.Integration.Test/StorageMigrationIntegrationTest.cs	(.../StorageMigrationIntegrationTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Application/Ringtoets/test/Application.Ringtoets.Integration.Test/StorageMigrationIntegrationTest.cs	(.../StorageMigrationIntegrationTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -171,7 +171,7 @@
 
         private static string GetTestProjectFilePath(string versionNumber)
         {
-            return TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core, $"MigrationTestProject{versionNumber}.rtd");
+            return TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core, $"MigrationTestProject{versionNumber}.rtd");
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationConsoleTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationConsoleTest.cs	(.../RingtoetsMigrationConsoleTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationConsoleTest.cs	(.../RingtoetsMigrationConsoleTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -134,7 +134,7 @@
         public void GivenConsole_WhenVersionSupportedCall_ThenReturnedIfSupported(string file, string fileVersion, bool isSupported)
         {
             // Given
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core, file);
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core, file);
             var console = new RingtoetsMigrationConsole();
             string expectedVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationToolTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -36,7 +36,7 @@
     public class RingtoetsMigrationToolTest
     {
         private TestEnvironmentControl environmentControl;
-        private readonly TestDataPath testPath = TestDataPath.Application.Ringtoets.Migration.Core;
+        private readonly TestDataPath testPath = TestDataPath.Ringtoets.Migration.Core;
 
         [SetUp]
         public void SetUp()
Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs
===================================================================
diff -u -r200847784b61f6b20669a587f218265ca66a8848 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision 200847784b61f6b20669a587f218265ca66a8848)
+++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -204,7 +204,7 @@
         [Test]
         public void GetTestDataPath_Always_VerifiedTestPaths()
         {
-            string path = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core);
+            string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core);
             Assert.IsTrue(Directory.Exists(path));
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Storage.Core);
             Assert.IsTrue(Directory.Exists(path));
Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs
===================================================================
diff -u -r200847784b61f6b20669a587f218265ca66a8848 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision 200847784b61f6b20669a587f218265ca66a8848)
+++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -36,17 +36,6 @@
             };
         }
 
-        public static class Application
-        {
-            public static class Ringtoets
-            {
-                public static class Migration
-                {
-                    public static readonly TestDataPath Core = System.IO.Path.Combine("Application", "Ringtoets", "test", "Application.Ringtoets.Migration.Core.Test");
-                }
-            }
-        }
-
         public static class Core
         {
             public static class Common
@@ -131,6 +120,11 @@
             {
                 public static readonly TestDataPath Core = System.IO.Path.Combine("Ringtoets", "Storage", "test", "Ringtoets.Storage.Core.Test");
             }
+
+            public static class Migration
+            {
+                public static readonly TestDataPath Core = System.IO.Path.Combine("Ringtoets", "Migration", "test", "Ringtoets.Migration.Core.Test");
+            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/MigrationLogDatabaseReaderTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/MigrationLogDatabaseReaderTest.cs	(.../MigrationLogDatabaseReaderTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/MigrationLogDatabaseReaderTest.cs	(.../MigrationLogDatabaseReaderTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -33,7 +33,7 @@
     [TestFixture]
     public class MigrationLogDatabaseReaderTest
     {
-        private static readonly TestDataPath testPath = TestDataPath.Application.Ringtoets.Migration.Core;
+        private static readonly TestDataPath testPath = TestDataPath.Ringtoets.Migration.Core;
 
         [Test]
         public void Constructor_ValidFilePath_ExpectedValues()
Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsDatabaseSourceFileTest.cs
===================================================================
diff -u -r5a7099af399c4c1f22a86f348cf0d74d9e03c7f7 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsDatabaseSourceFileTest.cs	(.../RingtoetsDatabaseSourceFileTest.cs)	(revision 5a7099af399c4c1f22a86f348cf0d74d9e03c7f7)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsDatabaseSourceFileTest.cs	(.../RingtoetsDatabaseSourceFileTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -31,7 +31,7 @@
     [TestFixture]
     public class RingtoetsDatabaseSourceFileTest
     {
-        private static readonly TestDataPath testPath = TestDataPath.Application.Ringtoets.Migration.Core;
+        private static readonly TestDataPath testPath = TestDataPath.Ringtoets.Migration.Core;
 
         [Test]
         public void Constructor_NonExistingPath_ThrowsCriticalFileReadException()
Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsVersionedFileTest.cs
===================================================================
diff -u -r5a7099af399c4c1f22a86f348cf0d74d9e03c7f7 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsVersionedFileTest.cs	(.../RingtoetsVersionedFileTest.cs)	(revision 5a7099af399c4c1f22a86f348cf0d74d9e03c7f7)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsVersionedFileTest.cs	(.../RingtoetsVersionedFileTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -101,7 +101,7 @@
         public void GetVersion_ParameteredConstructor_ExpectedProperties(string file, string expectedVersion)
         {
             // Setup
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core, file);
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core, file);
             var sourceFile = new RingtoetsVersionedFile(filePath);
 
             // Call
Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil.Test/RingtoetsProjectMigrationTestHelperTest.cs
===================================================================
diff -u -rc9f0e4abf9228ee5a4ce4274c01f359c183c58ba -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil.Test/RingtoetsProjectMigrationTestHelperTest.cs	(.../RingtoetsProjectMigrationTestHelperTest.cs)	(revision c9f0e4abf9228ee5a4ce4274c01f359c183c58ba)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil.Test/RingtoetsProjectMigrationTestHelperTest.cs	(.../RingtoetsProjectMigrationTestHelperTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -86,7 +86,7 @@
             string[] versions = RingtoetsProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileVersions().ToArray();
 
             // Call
-            List<string> returnedProjectVersions = versions.Select(v => new RingtoetsVersionedFile(TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+            List<string> returnedProjectVersions = versions.Select(v => new RingtoetsVersionedFile(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                                                                                               $"MigrationTestProject{v}.rtd")).GetVersion()).ToList();
 
             // Assert
Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs
===================================================================
diff -u -ra8ceb06ddf8e350872d2e81251760bd6fcf96056 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs	(.../RingtoetsProjectMigrationTestHelper.cs)	(revision a8ceb06ddf8e350872d2e81251760bd6fcf96056)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs	(.../RingtoetsProjectMigrationTestHelper.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -31,7 +31,7 @@
     /// </summary>
     public static class RingtoetsProjectMigrationTestHelper
     {
-        private static readonly TestDataPath testDataPath = TestDataPath.Application.Ringtoets.Migration.Core;
+        private static readonly TestDataPath testDataPath = TestDataPath.Ringtoets.Migration.Core;
 
         /// <summary>
         /// Retrieves the file path of a Ringtoets project with the latest database version
Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationIntegrationTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationIntegrationTest.cs	(.../MigrationIntegrationTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationIntegrationTest.cs	(.../MigrationIntegrationTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -33,7 +33,7 @@
     public class MigrationIntegrationTest
     {
         private const string latestVersion = "18.1";
-        private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core);
+        private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core);
 
         [Test]
         [TestCaseSource(nameof(GetFileNamesWithSpecialCharacters))]
@@ -79,7 +79,7 @@
         public void GivenEmpty164Project_WhenNoChangesMadeAndMigratingToLatestVersion_ThenLogDatabaseContainsMessagesSayingNoChangesMade()
         {
             // Given
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                                "Empty valid Release 16.4.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo171IntegrationTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -36,7 +36,7 @@
         public void Given164Project_WhenUpgradedTo171_ThenProjectAsExpected()
         {
             // Given
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                                "MigrationTestProject164.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo172IntegrationTest.cs
===================================================================
diff -u -rc9f0e4abf9228ee5a4ce4274c01f359c183c58ba -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo172IntegrationTest.cs	(.../MigrationTo172IntegrationTest.cs)	(revision c9f0e4abf9228ee5a4ce4274c01f359c183c58ba)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo172IntegrationTest.cs	(.../MigrationTo172IntegrationTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -40,7 +40,7 @@
         public void Given171Project_WhenUpgradedTo172_ThenProjectAsExpected()
         {
             // Given
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                                "MigrationTestProject171.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
@@ -128,7 +128,7 @@
             using (new FileDisposeHelper(sourceFilePath))
             using (new FileDisposeHelper(targetFilePath))
             {
-                File.Copy(TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+                File.Copy(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                      "Empty valid Release 17.1.rtd"),
                           sourceFilePath, true
                 );
@@ -213,7 +213,7 @@
             using (new FileDisposeHelper(sourceFilePath))
             using (new FileDisposeHelper(targetFilePath))
             {
-                File.Copy(TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+                File.Copy(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                      "Empty valid Release 17.1.rtd"),
                           sourceFilePath, true
                 );
Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo173IntegrationTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo173IntegrationTest.cs	(.../MigrationTo173IntegrationTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo173IntegrationTest.cs	(.../MigrationTo173IntegrationTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -35,7 +35,7 @@
         public void Given172Project_WhenUpgradedTo173_ThenProjectAsExpected()
         {
             // Given
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                                "MigrationTestProject172.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs
===================================================================
diff -u -ra4cc61cb15afca46040b11ccc183ed6e31ab50f3 -rad66b6e2df465acc900aa792c99dfdacee3f3a32
--- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs	(.../MigrationTo181IntegrationTest.cs)	(revision a4cc61cb15afca46040b11ccc183ed6e31ab50f3)
+++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs	(.../MigrationTo181IntegrationTest.cs)	(revision ad66b6e2df465acc900aa792c99dfdacee3f3a32)
@@ -55,7 +55,7 @@
         public void Given173Project_WhenUpgradedTo181_ThenProjectAsExpected()
         {
             // Given
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core,
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core,
                                                                "MigrationTestProject173.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);