Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs
===================================================================
diff -u -r3a43b94cc57918cf9c909dac4b9c3926f160f478 -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision 3a43b94cc57918cf9c909dac4b9c3926f160f478)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
@@ -75,10 +74,9 @@
         /// The view should contain the following location row data:
         /// <list type="bullet">
         /// <item>Row 1: location without output</item>
-        /// <item>Row 2: location with design water level output (but without general result)</item>
-        /// <item>Row 3: location with wave height output (but without general result)</item>
-        /// <item>Row 4: location with flag for parsing the general result set to true</item>
-        /// <item>Row 5: location with output containing a general result with two top level illustration points</item>
+        /// <item>Row 2: location with output not containing a general result</item>
+        /// <item>Row 3: location with the flag for parsing the general result set to true</item>
+        /// <item>Row 4: location with output containing a general result with two top level illustration points</item>
         /// </list>
         /// </remarks>
         /// <returns>The fully configured locations view.</returns>
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rf2ebd2cc0a13778b6a79feb1d5082c48de1a73cd -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision f2ebd2cc0a13778b6a79feb1d5082c48de1a73cd)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
@@ -704,13 +704,6 @@
                 },
                 new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
                 {
-                    WaveHeightCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(2.45)
-                    }
-                },
-                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
-                {
                     DesignWaterLevelCalculation1 =
                     {
                         InputParameters =
@@ -719,7 +712,7 @@
                         }
                     }
                 },
-                new HydraulicBoundaryLocation(5, "5", 5.0, 5.0)
+                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
                 {
                     DesignWaterLevelCalculation1 =
                     {
@@ -760,6 +753,11 @@
             {
                 return ((GrassCoverErosionOutwardsDesignWaterLevelLocationsView) view).FailureMechanism.HydraulicBoundaryLocations;
             }
+
+            protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+            {
+                return hydraulicBoundaryLocation.DesignWaterLevelCalculation1;
+            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -r86a27f942ae8ab4b5d9e29b7eaed63db0e8cc1e7 -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 86a27f942ae8ab4b5d9e29b7eaed63db0e8cc1e7)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
@@ -703,13 +703,6 @@
                 },
                 new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
                 {
-                    DesignWaterLevelCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(2.45)
-                    }
-                },
-                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
-                {
                     WaveHeightCalculation1 =
                     {
                         InputParameters =
@@ -718,7 +711,7 @@
                         }
                     }
                 },
-                new HydraulicBoundaryLocation(5, "5", 5.0, 5.0)
+                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
                 {
                     WaveHeightCalculation1 =
                     {
@@ -759,6 +752,11 @@
             {
                 return ((GrassCoverErosionOutwardsWaveHeightLocationsView) view).FailureMechanism.HydraulicBoundaryLocations;
             }
+
+            protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+            {
+                return hydraulicBoundaryLocation.WaveHeightCalculation1;
+            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
@@ -626,13 +626,6 @@
                 });
                 Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
                 {
-                    WaveHeightCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(2.45)
-                    }
-                });
-                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
-                {
                     DesignWaterLevelCalculation1 =
                     {
                         InputParameters =
@@ -655,7 +648,7 @@
                 var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints);
                 var output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult);
 
-                Locations.Add(new HydraulicBoundaryLocation(5, "5", 5.0, 5.0)
+                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
                 {
                     DesignWaterLevelCalculation1 =
                     {
@@ -704,6 +697,11 @@
             {
                 return locations;
             }
+
+            protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+            {
+                return hydraulicBoundaryLocation.DesignWaterLevelCalculation1;
+            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r86a27f942ae8ab4b5d9e29b7eaed63db0e8cc1e7 -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 86a27f942ae8ab4b5d9e29b7eaed63db0e8cc1e7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
@@ -626,13 +626,6 @@
                 });
                 Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
                 {
-                    DesignWaterLevelCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(2.45)
-                    }
-                });
-                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
-                {
                     WaveHeightCalculation1 =
                     {
                         InputParameters =
@@ -655,7 +648,7 @@
                 var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints);
                 var output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult);
 
-                Locations.Add(new HydraulicBoundaryLocation(5, "5", 5.0, 5.0)
+                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
                 {
                     WaveHeightCalculation1 =
                     {
@@ -704,6 +697,11 @@
             {
                 return locations;
             }
+
+            protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+            {
+                return hydraulicBoundaryLocation.WaveHeightCalculation1;
+            }
         }
     }
 }
\ No newline at end of file