Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsDatabaseFileTest.cs
===================================================================
diff -u -rf53b3c70d87b9e66c3a46981b8d8a471b95e2adc -rc0840b3d3dbdbfdcad2a6f55c117ac22ae95b365
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsDatabaseFileTest.cs	(.../RingtoetsDatabaseFileTest.cs)	(revision f53b3c70d87b9e66c3a46981b8d8a471b95e2adc)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsDatabaseFileTest.cs	(.../RingtoetsDatabaseFileTest.cs)	(revision c0840b3d3dbdbfdcad2a6f55c117ac22ae95b365)
@@ -52,7 +52,7 @@
         {
             // Setup
             string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, filename);
 
             using (new FileDisposeHelper(filePath))
             {
@@ -85,7 +85,7 @@
         {
             // Setup
             string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, filename);
 
             using (new FileDisposeHelper(filePath))
             using (var databaseFile = new RingtoetsDatabaseFile(filePath))
@@ -106,7 +106,7 @@
         {
             // Setup
             string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, filename);
 
             using (new FileDisposeHelper(filePath))
             using (var databaseFile = new RingtoetsDatabaseFile(filePath))
@@ -126,7 +126,7 @@
         {
             // Setup
             string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, filename);
 
             using (var databaseFile = new RingtoetsDatabaseFile(filePath))
             {
@@ -147,7 +147,7 @@
         {
             // Setup
             string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, filename);
 
             // Call
             TestDelegate call = () =>
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs
===================================================================
diff -u -raf53f335d0fa6920f7a5c4ab27b112bae9eeaede -rc0840b3d3dbdbfdcad2a6f55c117ac22ae95b365
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs	(.../RingtoetsSqLiteDatabaseFileMigratorTest.cs)	(revision af53f335d0fa6920f7a5c4ab27b112bae9eeaede)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs	(.../RingtoetsSqLiteDatabaseFileMigratorTest.cs)	(revision c0840b3d3dbdbfdcad2a6f55c117ac22ae95b365)
@@ -73,7 +73,7 @@
         public void NeedsMigrate_NeedsMigrate_ReturnsTrue()
         {
             // Setup
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             var versionedFile = new RingtoetsVersionedFile(sourceFilePath);
             var migrator = new RingtoetsSqLiteDatabaseFileMigrator();
 
@@ -88,7 +88,7 @@
         public void NeedsMigrate_DoesNotNeedMigration_ReturnsFalse()
         {
             // Setup
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             var versionedFile = new RingtoetsVersionedFile(sourceFilePath);
             var migrator = new RingtoetsSqLiteDatabaseFileMigrator();
 
@@ -104,7 +104,7 @@
         {
             // Setup
             const string newVersion = "17.1";
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
@@ -126,7 +126,7 @@
         {
             // Setup
             const string newVersion = "17.1";
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
@@ -151,7 +151,7 @@
         {
             // Setup
             const string newVersion = "17.1";
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
             var migrator = new RingtoetsSqLiteDatabaseFileMigrator();
 
@@ -169,7 +169,7 @@
         {
             // Setup
             const string newVersion = "17.1";
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
@@ -203,7 +203,7 @@
         {
             // Setup
             const string newVersion = "6";
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             var fromVersionedFile = new RingtoetsVersionedFile(sourceFilePath);
 
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsUpgradeScriptTest.cs
===================================================================
diff -u -r22d820ab9e0333ce64e9ea74ac19867042906298 -rc0840b3d3dbdbfdcad2a6f55c117ac22ae95b365
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsUpgradeScriptTest.cs	(.../RingtoetsUpgradeScriptTest.cs)	(revision 22d820ab9e0333ce64e9ea74ac19867042906298)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsUpgradeScriptTest.cs	(.../RingtoetsUpgradeScriptTest.cs)	(revision c0840b3d3dbdbfdcad2a6f55c117ac22ae95b365)
@@ -156,7 +156,7 @@
         {
             // Setup
             string filename = Path.GetRandomFileName();
-            string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, filename);
 
             var mockRepository = new MockRepository();
             var sourceVersionedFile = mockRepository.Stub<IVersionedFile>();
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsVersionedFileTest.cs
===================================================================
diff -u -r214922706cd2559757df5b96982bd99cf0fe9cfa -rc0840b3d3dbdbfdcad2a6f55c117ac22ae95b365
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsVersionedFileTest.cs	(.../RingtoetsVersionedFileTest.cs)	(revision 214922706cd2559757df5b96982bd99cf0fe9cfa)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsVersionedFileTest.cs	(.../RingtoetsVersionedFileTest.cs)	(revision c0840b3d3dbdbfdcad2a6f55c117ac22ae95b365)
@@ -96,8 +96,8 @@
             }
         }
 
-        [TestCase("Demo164.rtd", "4")]
-        [TestCase("Demo171.rtd", "17.1")]
+        [TestCase("FullTestProject164.rtd", "4")]
+        [TestCase("FullTestProject171.rtd", "17.1")]
         public void GetVersion_ParameteredConstructor_ExptectedProperties(string file, string expectedVersion)
         {
             // Setup
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/test-data/Demo164.rtd
===================================================================
diff -u -r214922706cd2559757df5b96982bd99cf0fe9cfa -rc0840b3d3dbdbfdcad2a6f55c117ac22ae95b365
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/test-data/Demo171.rtd
===================================================================
diff -u -r214922706cd2559757df5b96982bd99cf0fe9cfa -rc0840b3d3dbdbfdcad2a6f55c117ac22ae95b365
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/test-data/FullTestProject171.rtd
===================================================================
diff -u
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationToolTest.cs
===================================================================
diff -u -r214922706cd2559757df5b96982bd99cf0fe9cfa -rc0840b3d3dbdbfdcad2a6f55c117ac22ae95b365
--- Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision 214922706cd2559757df5b96982bd99cf0fe9cfa)
+++ Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision c0840b3d3dbdbfdcad2a6f55c117ac22ae95b365)
@@ -225,7 +225,7 @@
             const string migrateCommand = "--migrate";
 
             const string newVersion = "17.1";
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
 
             using (new FileDisposeHelper(targetFilePath))
@@ -262,7 +262,7 @@
             const string migrateCommand = "--migrate";
 
             const string newVersion = "17.1";
-            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "Demo164.rtd");
+            string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
 
             string consoleText;