Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r6c7a703ee166f8e12f861be7150b359ce9d8a51e
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision 6c7a703ee166f8e12f861be7150b359ce9d8a51e)
@@ -115,7 +115,7 @@
             RoundedDouble normativeAssessmentLevel = assessmentSection.GetNormativeAssessmentLevel(null);
 
             // Assert
-            Assert.AreEqual(RoundedDouble.NaN, normativeAssessmentLevel);
+            Assert.IsNaN(normativeAssessmentLevel);
         }
 
         [TestCase(NormType.Signaling)]
@@ -130,7 +130,7 @@
             RoundedDouble normativeAssessmentLevel = assessmentSection.GetNormativeAssessmentLevel(new TestHydraulicBoundaryLocation());
 
             // Assert
-            Assert.AreEqual(RoundedDouble.NaN, normativeAssessmentLevel);
+            Assert.IsNaN(normativeAssessmentLevel);
         }
 
         [TestCase(NormType.Signaling)]
@@ -150,7 +150,7 @@
             RoundedDouble normativeAssessmentLevel = assessmentSection.GetNormativeAssessmentLevel(hydraulicBoundaryLocation);
 
             // Assert
-            Assert.AreEqual(RoundedDouble.NaN, normativeAssessmentLevel);
+            Assert.IsNaN(normativeAssessmentLevel);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6c7a703ee166f8e12f861be7150b359ce9d8a51e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision 6c7a703ee166f8e12f861be7150b359ce9d8a51e)
@@ -48,7 +48,7 @@
             // Assert
             Assert.IsFalse(properties.UseBreakWater);
             Assert.IsNull(properties.BreakWaterType);
-            Assert.AreEqual(RoundedDouble.NaN, properties.BreakWaterHeight);
+            Assert.IsNaN(properties.BreakWaterHeight);
             Assert.IsEmpty(properties.ToString());
         }
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs
===================================================================
diff -u -re1da5ba4a11e6fc62ef365f804ee50c23cf5547f -r6c7a703ee166f8e12f861be7150b359ce9d8a51e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs	(.../MacroStabilityInwardsInputViewTest.cs)	(revision e1da5ba4a11e6fc62ef365f804ee50c23cf5547f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs	(.../MacroStabilityInwardsInputViewTest.cs)	(revision 6c7a703ee166f8e12f861be7150b359ce9d8a51e)
@@ -116,54 +116,6 @@
         }
 
         [Test]
-        public void Constructor_ScenarioWithSurfaceLineAndStochasticSoilProfile1D_DataSetToCollectionOfFilledChartData()
-        {
-            // Setup
-            MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
-            MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile1D();
-
-            var calculation = new MacroStabilityInwardsCalculationScenario
-            {
-                InputParameters =
-                {
-                    SurfaceLine = surfaceLine,
-                    StochasticSoilProfile = stochasticSoilProfile
-                }
-            };
-
-            // Call
-            using (var view = new MacroStabilityInwardsInputView(calculation, GetTestNormativeAssessmentLevel))
-            {
-                // Assert
-                MacroStabilityInwardsInputViewChartDataAssert.AssertChartData(calculation, view.Chart.Data);
-            }
-        }
-
-        [Test]
-        public void Constructor_ScenarioWithSurfaceLineAndStochasticSoilProfile2D_DataSetToCollectionOfFilledChartData()
-        {
-            // Setup
-            MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
-            MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
-
-            var calculation = new MacroStabilityInwardsCalculationScenario
-            {
-                InputParameters =
-                {
-                    SurfaceLine = surfaceLine,
-                    StochasticSoilProfile = stochasticSoilProfile
-                }
-            };
-
-            // Call
-            using (var view = new MacroStabilityInwardsInputView(calculation, GetTestNormativeAssessmentLevel))
-            {
-                // Assert
-                MacroStabilityInwardsInputViewChartDataAssert.AssertChartData(calculation, view.Chart.Data);
-            }
-        }
-
-        [Test]
         public void Constructor_ScenarioWithoutSurfaceLine_NoChartDataSet()
         {
             // Setup
@@ -905,6 +857,36 @@
             }
         }
 
+        [Test]
+        [TestCaseSource(nameof(StochasticSoilProfiles))]
+        public void Constructor_ScenarioWithSurfaceLineAndStochasticSoilProfile_DataSetToCollectionOfFilledChartData(MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile)
+        {
+            // Setup
+            MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
+
+            var calculation = new MacroStabilityInwardsCalculationScenario
+            {
+                InputParameters =
+                {
+                    SurfaceLine = surfaceLine,
+                    StochasticSoilProfile = stochasticSoilProfile
+                }
+            };
+
+            // Call
+            using (var view = new MacroStabilityInwardsInputView(calculation, GetTestNormativeAssessmentLevel))
+            {
+                // Assert
+                MacroStabilityInwardsInputViewChartDataAssert.AssertChartData(calculation, view.Chart.Data);
+            }
+        }
+
+        private static IEnumerable<TestCaseData> StochasticSoilProfiles()
+        {
+            yield return new TestCaseData(GetStochasticSoilProfile1D());
+            yield return new TestCaseData(MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D());
+        }
+
         private static void SetGridValues(MacroStabilityInwardsGrid grid)
         {
             grid.NumberOfHorizontalPoints = 2;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj
===================================================================
diff -u -r52f4e85149b84c591764b57b65bf052729294a37 -r6c7a703ee166f8e12f861be7150b359ce9d8a51e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Plugin.Test.csproj)	(revision 52f4e85149b84c591764b57b65bf052729294a37)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Plugin.Test.csproj)	(revision 6c7a703ee166f8e12f861be7150b359ce9d8a51e)
@@ -147,10 +147,6 @@
       <Project>{0943dda8-8fab-4d0b-8e9c-8a1a9b3273b4}</Project>
       <Name>Ringtoets.MacroStabilityInwards.IO</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.KernelWrapper\Ringtoets.MacroStabilityInwards.KernelWrapper.csproj">
-      <Project>{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.KernelWrapper</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Plugin\Ringtoets.MacroStabilityInwards.Plugin.csproj">
       <Project>{b6b27968-6b39-48df-b2e5-cbabf362808c}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Plugin</Name>
@@ -159,10 +155,6 @@
       <Project>{e9b39743-2dc9-4922-9e0f-6ba3e0e54189}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj">
-      <Project>{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Data.TestUtil\Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj">
       <Project>{2b78cf04-4785-4f27-a6e5-45bddbb7bf04}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data.TestUtil</Name>