Index: Core/Common/test/Core.Common.TestUtil.Test/ControlsTestHelperTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil.Test/ControlsTestHelperTest.cs	(.../ControlsTestHelperTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.TestUtil.Test/ControlsTestHelperTest.cs	(.../ControlsTestHelperTest.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -70,7 +70,7 @@
 
                 // Assert
                 Assert.AreEqual(value2, control.SelectedValue);
-                var expectedRaisedEvents = new[]
+                string[] expectedRaisedEvents =
                 {
                     selectedvaluechanged,
                     selectedindexchanged,
Index: Core/Common/test/Core.Common.TestUtil.Test/DirectoryDisposeHelperTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil.Test/DirectoryDisposeHelperTest.cs	(.../DirectoryDisposeHelperTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.TestUtil.Test/DirectoryDisposeHelperTest.cs	(.../DirectoryDisposeHelperTest.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -393,6 +393,7 @@
             {
                 // Ignore
             }
+
             Assert.Fail(exception.Message, exception.InnerException);
         }
     }
Index: Core/Common/test/Core.Common.TestUtil.Test/DoubleWithToleranceComparerTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil.Test/DoubleWithToleranceComparerTest.cs	(.../DoubleWithToleranceComparerTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.TestUtil.Test/DoubleWithToleranceComparerTest.cs	(.../DoubleWithToleranceComparerTest.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -104,9 +104,7 @@
             var comparer = new DoubleWithToleranceComparer(1.1);
 
             // Call
-            int result = castToObject ?
-                             comparer.Compare((object) first, second) :
-                             comparer.Compare(first, second);
+            int result = castToObject ? comparer.Compare((object) first, second) : comparer.Compare(first, second);
 
             // Assert
             Assert.Less(result, 0);
@@ -123,9 +121,7 @@
             var comparer = new DoubleWithToleranceComparer(0.5);
 
             // Call
-            int result = castToObject ?
-                             comparer.Compare((object) first, second) :
-                             comparer.Compare(first, second);
+            int result = castToObject ? comparer.Compare((object) first, second) : comparer.Compare(first, second);
 
             // Assert
             Assert.Greater(result, 0);
Index: Core/Common/test/Core.Common.TestUtil.Test/FileDisposeHelperTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil.Test/FileDisposeHelperTest.cs	(.../FileDisposeHelperTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.TestUtil.Test/FileDisposeHelperTest.cs	(.../FileDisposeHelperTest.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -72,6 +72,7 @@
                 File.Delete(filePath);
                 Assert.Fail(exception.Message);
             }
+
             Assert.IsFalse(File.Exists(filePath));
         }
 
@@ -98,6 +99,7 @@
                 File.Delete(filePath);
                 Assert.Fail(exception.Message);
             }
+
             Assert.IsFalse(File.Exists(filePath));
         }
 
@@ -118,7 +120,7 @@
         public void Constructor_MultipleFiles_CreatesFiles()
         {
             // Setup
-            var filePaths = new[]
+            string[] filePaths =
             {
                 Path.Combine(workingDirectory, $"{nameof(Constructor_MultipleFiles_CreatesFiles)}_0"),
                 Path.Combine(workingDirectory, $"{nameof(Constructor_MultipleFiles_CreatesFiles)}_1")
@@ -159,7 +161,7 @@
         public void Constructor_FilePathsThatCannotBeCreated_ThrowsArgumentException()
         {
             // Setup
-            var filePaths = new[]
+            string[] filePaths =
             {
                 TestHelper.GetScratchPadPath(Path.Combine("nonExistingPath", "fileThatCannotBeCreated"))
             };
@@ -327,7 +329,7 @@
         public void Dispose_MultipleFiles_DeletesFiles()
         {
             // Setup
-            var filePaths = new[]
+            string[] filePaths =
             {
                 Path.Combine(workingDirectory, $"{nameof(Dispose_MultipleFiles_DeletesFiles)}_0"),
                 Path.Combine(workingDirectory, $"{nameof(Dispose_MultipleFiles_DeletesFiles)}_1")
@@ -429,6 +431,7 @@
             {
                 return false;
             }
+
             return true;
         }
     }
Index: Core/Common/test/Core.Common.TestUtil/ChangePropertyData.cs
===================================================================
diff -u -r23736f02aebaa81ea07ebd03f782a2548e2096df -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/ChangePropertyData.cs	(.../ChangePropertyData.cs)	(revision 23736f02aebaa81ea07ebd03f782a2548e2096df)
+++ Core/Common/test/Core.Common.TestUtil/ChangePropertyData.cs	(.../ChangePropertyData.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -42,6 +42,7 @@
             {
                 throw new ArgumentNullException(nameof(actionToChangeProperty));
             }
+
             if (propertyName == null)
             {
                 throw new ArgumentNullException(nameof(propertyName));
Index: Core/Common/test/Core.Common.TestUtil/DirectoryDisposeHelper.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/DirectoryDisposeHelper.cs	(.../DirectoryDisposeHelper.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.TestUtil/DirectoryDisposeHelper.cs	(.../DirectoryDisposeHelper.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -62,6 +62,7 @@
             {
                 throw new ArgumentNullException(nameof(rootFolder));
             }
+
             if (subFolders == null || !subFolders.Any())
             {
                 throw new ArgumentException(@"Must have at least one sub folder.", nameof(subFolders));
@@ -101,6 +102,7 @@
             {
                 throw new InvalidOperationException($"Directory '{rootPathToTemp}' is not locked.");
             }
+
             directoryPermissionsRevoker.Dispose();
         }
 
Index: Core/Common/test/Core.Common.TestUtil/DirectoryPermissionsRevoker.cs
===================================================================
diff -u -r9649e55312348f856051d40881b4e902b1a15a3b -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/DirectoryPermissionsRevoker.cs	(.../DirectoryPermissionsRevoker.cs)	(revision 9649e55312348f856051d40881b4e902b1a15a3b)
+++ Core/Common/test/Core.Common.TestUtil/DirectoryPermissionsRevoker.cs	(.../DirectoryPermissionsRevoker.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -74,6 +74,7 @@
                 // The FileSystemRights Synchronize by itself cannot be set.
                 throw new NotSupportedException($"Setting the right {rights} is not supported.");
             }
+
             AddDenyDirectoryInfoRight(GetSupportedFileSystemRights(rights));
         }
 
Index: Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs
===================================================================
diff -u -r569a286badd9b3494f5465cc2767a8cf6a77f618 -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs	(.../DoubleWithToleranceComparer.cs)	(revision 569a286badd9b3494f5465cc2767a8cf6a77f618)
+++ Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs	(.../DoubleWithToleranceComparer.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -44,6 +44,7 @@
             {
                 throw new ArgumentException($"Cannot compare objects other than {typeof(double)} with this comparer.");
             }
+
             return Compare((double) x, (double) y);
         }
 
Index: Core/Common/test/Core.Common.TestUtil/EnumValuesTestFixture.cs
===================================================================
diff -u -r569a286badd9b3494f5465cc2767a8cf6a77f618 -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/EnumValuesTestFixture.cs	(.../EnumValuesTestFixture.cs)	(revision 569a286badd9b3494f5465cc2767a8cf6a77f618)
+++ Core/Common/test/Core.Common.TestUtil/EnumValuesTestFixture.cs	(.../EnumValuesTestFixture.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -44,6 +44,7 @@
                 {
                     Assert.Fail($"Missing test case for value '{typeof(TEnum)}.{value}'.");
                 }
+
                 Assert.AreEqual(ExpectedValueForEnumValues[value], actual,
                                 $"Value for {value} incorrect.");
             }
Index: Core/Common/test/Core.Common.TestUtil/FileDisposeHelper.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/FileDisposeHelper.cs	(.../FileDisposeHelper.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Common/test/Core.Common.TestUtil/FileDisposeHelper.cs	(.../FileDisposeHelper.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -59,6 +59,7 @@
             {
                 filePathStreams.Add(filePath, null);
             }
+
             Create();
         }
 
@@ -205,6 +206,7 @@
                     {
                         throw new ArgumentException(e.Message);
                     }
+
                     throw;
                 }
             }
Index: Core/Common/test/Core.Common.TestUtil/LogLevelConstant.cs
===================================================================
diff -u -re3ebc9635d55057cb242e9a5b4f650b9c87737a8 -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/LogLevelConstant.cs	(.../LogLevelConstant.cs)	(revision e3ebc9635d55057cb242e9a5b4f650b9c87737a8)
+++ Core/Common/test/Core.Common.TestUtil/LogLevelConstant.cs	(.../LogLevelConstant.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -53,7 +53,7 @@
         {
             if (!Enum.IsDefined(typeof(LogLevelConstant), level))
             {
-                throw new InvalidEnumArgumentException(nameof(level), (int)level, typeof(LogLevelConstant));
+                throw new InvalidEnumArgumentException(nameof(level), (int) level, typeof(LogLevelConstant));
             }
 
             switch (level)
Index: Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs
===================================================================
diff -u -rcaf283454626efc376c01fc0e54ab4c902aaf1df -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs	(.../RandomExtensions.cs)	(revision caf283454626efc376c01fc0e54ab4c902aaf1df)
+++ Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs	(.../RandomExtensions.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -61,6 +61,7 @@
                                  $"and upper limit {upperLimit} did not result in a finite value.";
                 throw new NotFiniteNumberException(message, randomValue);
             }
+
             return randomValue;
         }
 
@@ -166,7 +167,7 @@
             {
                 throw new ArgumentException($"'{nameof(enumValues)}' cannot be an empty collection.");
             }
-            
+
             return enumValues.ElementAt(random.Next(enumValues.Count()));
         }
     }
Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs
===================================================================
diff -u -r9ad4c9daea5f2a20f2cc61df9ea79d1144d84b2e -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision 9ad4c9daea5f2a20f2cc61df9ea79d1144d84b2e)
+++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -107,6 +107,11 @@
                 public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "MacroStabilityInwards", "test", "Ringtoets.MacroStabilityInwards.IO.Test");
             }
 
+            public static class Migration
+            {
+                public static readonly TestDataPath Core = System.IO.Path.Combine("Ringtoets", "Migration", "test", "Ringtoets.Migration.Core.Test");
+            }
+
             public static class Piping
             {
                 public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "Piping", "test", "Ringtoets.Piping.IO.Test");
@@ -126,11 +131,6 @@
             {
                 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: Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs	(.../WpfTestHelper.xaml.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs	(.../WpfTestHelper.xaml.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -83,6 +83,7 @@
             {
                 throw new NotImplementedException();
             }
+
             WindowsFormsTestHelper.CloseAll(); // just in case, since we have mixed WPF / WF app
 
             Close();
@@ -147,6 +148,7 @@
                     Content = control
                 };
             }
+
             window.IsVisibleChanged += delegate
             {
                 if (window.IsVisible)
Index: Core/Common/test/Core.Common.Util.Test/IO/EmbeddedResourceFileWriterTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.Util.Test/IO/EmbeddedResourceFileWriterTest.cs	(.../EmbeddedResourceFileWriterTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Common/test/Core.Common.Util.Test/IO/EmbeddedResourceFileWriterTest.cs	(.../EmbeddedResourceFileWriterTest.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -77,6 +77,7 @@
                     {
                         File.Delete(filePath1);
                     }
+
                     if (File.Exists(filePath2))
                     {
                         File.Delete(filePath2);
Index: Core/Common/test/Core.Common.Util.Test/IOUtilsTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.Util.Test/IOUtilsTest.cs	(.../IOUtilsTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Common/test/Core.Common.Util.Test/IOUtilsTest.cs	(.../IOUtilsTest.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -145,6 +145,7 @@
             {
                 stringBuilder.Append("A");
             }
+
             stringBuilder.Append(Path.DirectorySeparatorChar);
             string tooLongFolderPath = stringBuilder.ToString();
 
@@ -205,6 +206,7 @@
             {
                 stringBuilder.Append("A");
             }
+
             stringBuilder.Append(Path.DirectorySeparatorChar);
             string tooLongFolderPath = stringBuilder.ToString();
 
Index: Core/Common/test/Core.Common.Util.TestUtil.Test/Settings/UseCustomSettingsHelperTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r40e0932424c21dff5870ce40684df4d22882a55e
--- Core/Common/test/Core.Common.Util.TestUtil.Test/Settings/UseCustomSettingsHelperTest.cs	(.../UseCustomSettingsHelperTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Common/test/Core.Common.Util.TestUtil.Test/Settings/UseCustomSettingsHelperTest.cs	(.../UseCustomSettingsHelperTest.cs)	(revision 40e0932424c21dff5870ce40684df4d22882a55e)
@@ -45,6 +45,7 @@
                 // Then
                 Assert.AreSame(helper, SettingsHelper.Instance);
             }
+
             Assert.AreSame(originalHelper, SettingsHelper.Instance);
             mocks.VerifyAll();
         }