Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r214f9fbafa2d876c75633dd945f27e2d68b478b1 -r9b374f8958d109fb3f1facd44053d342dc984f82
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 214f9fbafa2d876c75633dd945f27e2d68b478b1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 9b374f8958d109fb3f1facd44053d342dc984f82)
@@ -139,7 +139,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            ShowDesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocation>(), assessmentSection, 0.01, testForm);
+            ShowDesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, testForm);
 
             // Assert
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -624,7 +624,7 @@
                                 });
         }
 
-        private static GrassCoverErosionOutwardsDesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView(ObservableList<HydraulicBoundaryLocation> locations,
+        private static GrassCoverErosionOutwardsDesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
                                                                                                                 IAssessmentSection assessmentSection,
                                                                                                                 double norm,
                                                                                                                 Form form)
@@ -633,10 +633,9 @@
             {
                 Contribution = 10
             };
-            failureMechanism.HydraulicBoundaryLocations.AddRange(locations);
 
-            var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(failureMechanism,
-                                                                                  hbl => hbl.DesignWaterLevelCalculation1,
+            var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(calculations,
+                                                                                  failureMechanism,
                                                                                   assessmentSection,
                                                                                   () => norm);
 
@@ -656,6 +655,11 @@
                                                                                                                                double norm,
                                                                                                                                Form form)
         {
+            return ShowDesignWaterLevelLocationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, norm, form);
+        }
+
+        private static ObservableList<HydraulicBoundaryLocationCalculation> GetTestHydraulicBoundaryLocationCalculations()
+        {
             var topLevelIllustrationPoints = new[]
             {
                 new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
@@ -667,42 +671,30 @@
             };
 
             var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints);
-            var output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult);
 
-            var locations = new ObservableList<HydraulicBoundaryLocation>
+            return new ObservableList<HydraulicBoundaryLocationCalculation>
             {
-                new HydraulicBoundaryLocation(1, "1", 1.0, 1.0),
-                new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)),
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0))
                 {
-                    DesignWaterLevelCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(1.23)
-                    }
+                    Output = new TestHydraulicBoundaryLocationOutput(1.23)
                 },
-                new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0))
                 {
-                    DesignWaterLevelCalculation1 =
+                    InputParameters =
                     {
-                        InputParameters =
-                        {
-                            ShouldIllustrationPointsBeCalculated = true
-                        }
+                        ShouldIllustrationPointsBeCalculated = true
                     }
                 },
-                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0))
                 {
-                    DesignWaterLevelCalculation1 =
+                    InputParameters =
                     {
-                        InputParameters =
-                        {
-                            ShouldIllustrationPointsBeCalculated = true
-                        },
-                        Output = output
-                    }
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
+                    Output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult)
                 }
             };
-
-            return ShowDesignWaterLevelLocationsView(locations, assessmentSection, norm, form);
         }
 
         [TestFixture]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -r214f9fbafa2d876c75633dd945f27e2d68b478b1 -r9b374f8958d109fb3f1facd44053d342dc984f82
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 214f9fbafa2d876c75633dd945f27e2d68b478b1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 9b374f8958d109fb3f1facd44053d342dc984f82)
@@ -139,7 +139,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            ShowWaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocation>(), assessmentSection, 0.01, testForm);
+            ShowWaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, testForm);
 
             // Assert
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -624,7 +624,7 @@
                                 });
         }
 
-        private static GrassCoverErosionOutwardsWaveHeightLocationsView ShowWaveHeightLocationsView(ObservableList<HydraulicBoundaryLocation> locations,
+        private static GrassCoverErosionOutwardsWaveHeightLocationsView ShowWaveHeightLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
                                                                                                     IAssessmentSection assessmentSection,
                                                                                                     double norm,
                                                                                                     Form form)
@@ -633,10 +633,9 @@
             {
                 Contribution = 10
             };
-            failureMechanism.HydraulicBoundaryLocations.AddRange(locations);
 
-            var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(failureMechanism,
-                                                                            hbl => hbl.WaveHeightCalculation1,
+            var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(calculations,
+                                                                            failureMechanism,
                                                                             assessmentSection,
                                                                             () => norm);
 
@@ -656,6 +655,11 @@
                                                                                                                    double norm,
                                                                                                                    Form form)
         {
+            return ShowWaveHeightLocationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, norm, form);
+        }
+
+        private static ObservableList<HydraulicBoundaryLocationCalculation> GetTestHydraulicBoundaryLocationCalculations()
+        {
             var topLevelIllustrationPoints = new[]
             {
                 new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
@@ -667,42 +671,30 @@
             };
 
             var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints);
-            var output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult);
 
-            var locations = new ObservableList<HydraulicBoundaryLocation>
+            return new ObservableList<HydraulicBoundaryLocationCalculation>
             {
-                new HydraulicBoundaryLocation(1, "1", 1.0, 1.0),
-                new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)),
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0))
                 {
-                    WaveHeightCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(1.23)
-                    }
+                    Output = new TestHydraulicBoundaryLocationOutput(1.23)
                 },
-                new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0))
                 {
-                    WaveHeightCalculation1 =
+                    InputParameters =
                     {
-                        InputParameters =
-                        {
-                            ShouldIllustrationPointsBeCalculated = true
-                        }
+                        ShouldIllustrationPointsBeCalculated = true
                     }
                 },
-                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0))
                 {
-                    WaveHeightCalculation1 =
+                    InputParameters =
                     {
-                        InputParameters =
-                        {
-                            ShouldIllustrationPointsBeCalculated = true
-                        },
-                        Output = output
-                    }
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
+                    Output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult)
                 }
             };
-
-            return ShowWaveHeightLocationsView(locations, assessmentSection, norm, form);
         }
 
         [TestFixture]