Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r7e42f569488ce8073fbe656e3cf8525a8bb2ad9d
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs)	(revision 7e42f569488ce8073fbe656e3cf8525a8bb2ad9d)
@@ -21,6 +21,7 @@
 
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Base;
 using Core.Common.Util.Reflection;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -35,7 +36,7 @@
     [TestFixture]
     public class GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest
     {
-        private const int locationCalculateColumnIndex = 0;
+        private const int calculateColumnIndex = 0;
 
         private Form testForm;
 
@@ -67,7 +68,7 @@
             {
                 var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true).First();
                 DataGridViewRowCollection rows = dataGridView.Rows;
-                rows[0].Cells[locationCalculateColumnIndex].Value = true;
+                rows[0].Cells[calculateColumnIndex].Value = true;
             }
 
             GrassCoverErosionOutwardsFailureMechanism failureMechanism = view.FailureMechanism;
@@ -98,27 +99,22 @@
             {
                 Contribution = 5
             };
-            failureMechanism.HydraulicBoundaryLocations.AddRange(new[]
+
+            var calculations = 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))
                 {
-                    WaveHeightCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(2.45)
-                    }
+                    Output = new TestHydraulicBoundaryLocationOutput(2.45)
                 }
-            });
+            };
 
-            var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(failureMechanism,
-                                                                                  hbl => hbl.DesignWaterLevelCalculation1,
+            var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(calculations,
+                                                                                  failureMechanism,
                                                                                   new AssessmentSection(AssessmentSectionComposition.Dike),
                                                                                   () => 0.01);
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r7e42f569488ce8073fbe656e3cf8525a8bb2ad9d
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs)	(revision 7e42f569488ce8073fbe656e3cf8525a8bb2ad9d)
@@ -21,6 +21,7 @@
 
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Base;
 using Core.Common.Util.Reflection;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -35,7 +36,7 @@
     [TestFixture]
     public class GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest
     {
-        private const int locationCalculateColumnIndex = 0;
+        private const int calculateColumnIndex = 0;
 
         private Form testForm;
 
@@ -67,7 +68,7 @@
             {
                 var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true).First();
                 DataGridViewRowCollection rows = dataGridView.Rows;
-                rows[0].Cells[locationCalculateColumnIndex].Value = true;
+                rows[0].Cells[calculateColumnIndex].Value = true;
             }
 
             GrassCoverErosionOutwardsFailureMechanism failureMechanism = view.FailureMechanism;
@@ -98,27 +99,22 @@
             {
                 Contribution = 5
             };
-            failureMechanism.HydraulicBoundaryLocations.AddRange(new[]
+
+            var calculations = 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))
                 {
-                    WaveHeightCalculation1 =
-                    {
-                        Output = new TestHydraulicBoundaryLocationOutput(2.45)
-                    }
+                    Output = new TestHydraulicBoundaryLocationOutput(2.45)
                 }
-            });
+            };
 
-            var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(failureMechanism,
-                                                                            hbl => hbl.WaveHeightCalculation1,
+            var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(calculations,
+                                                                            failureMechanism,
                                                                             new AssessmentSection(AssessmentSectionComposition.Dike),
                                                                             () => 0.01);