Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs
===================================================================
diff -u -rb6d487f36edb7b6ca133a0e26d1ab7bda4c6bab6 -r5ec759496df2662a183c1c5ed74e3724bd834ae2
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs	(.../RingtoetsProjectMigratorTest.cs)	(revision b6d487f36edb7b6ca133a0e26d1ab7bda4c6bab6)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs	(.../RingtoetsProjectMigratorTest.cs)	(revision 5ec759496df2662a183c1c5ed74e3724bd834ae2)
@@ -24,6 +24,7 @@
 using System.Linq;
 using System.Threading;
 using Application.Ringtoets.Migration.Core;
+using Core.Common.Base.Storage;
 using Core.Common.Gui;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
@@ -61,8 +62,7 @@
             var migrator = new RingtoetsProjectMigrator(inquiryHelper);
 
             // Assert
-            // TODO: introduce the IMigrateProject in Core.Common.Base
-            Assert.IsInstanceOf<object>(migrator);
+            Assert.IsInstanceOf<IMigrateProject>(migrator);
 
             mocks.VerifyAll();
         }
@@ -238,7 +238,7 @@
             string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
 
             string targetFile = $"{nameof(GivenMigratorAndSupportedFile_WhenContinuedAfterInquiryAndValidTargetLocationGivenWithoutExtension_ThenFileSuccessFullyMigratesAndExtensionAdded)}";
-            string targetFilePath = TestHelper.GetScratchPadPath(Path.Combine(testDirectory, targetFile));
+            string targetFilePath = Path.Combine(TestHelper.GetScratchPadPath(), testDirectory, targetFile);
             string expectedVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
 
             var mocks = new MockRepository();
@@ -286,7 +286,7 @@
             string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "FullTestProject164.rtd");
 
             string targetFile = $"{nameof(GivenMigratorAndSupportedFile_WhenContinuedAfterInquiryAndValidTargetLocationGiven_ThenFileSuccessFullyMigrates)}.rtd";
-            string targetFilePath = TestHelper.GetScratchPadPath(Path.Combine(testDirectory, targetFile));
+            string targetFilePath = Path.Combine(TestHelper.GetScratchPadPath(), testDirectory, targetFile);
             string expectedVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
 
             var mocks = new MockRepository();
@@ -398,7 +398,7 @@
             // Setup
             string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, "UnsupportedVersion8.rtd");
             string targetFile = $"{nameof(Migrate_UnsupportedSourceFileVersion_ThenLogsError)}";
-            string targetFilePath = TestHelper.GetScratchPadPath(Path.Combine(testDirectory, targetFile));
+            string targetFilePath = Path.Combine(TestHelper.GetScratchPadPath(), testDirectory, targetFile);
 
             var mocks = new MockRepository();
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();