Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r05f3fd4c3a60e900788ebc333fa609136a639725 -r21247af98062ee0734c9c8a80f7dd7483463ee61
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 05f3fd4c3a60e900788ebc333fa609136a639725)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 21247af98062ee0734c9c8a80f7dd7483463ee61)
@@ -188,16 +188,15 @@
 
         private static void AssertGrassCoverErosionOutwardsFailureMechanism(AssessmentSection demoAssessmentSection)
         {
-            HydraulicBoundaryLocation[] hydraulicBoundaryLocations = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.ToArray();
+            ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations = demoAssessmentSection.HydraulicBoundaryDatabase.Locations;
+            ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocationsGrassOutwards = demoAssessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations;
 
-            Assert.AreEqual(demoAssessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Count, hydraulicBoundaryLocations.Length);
+            Assert.AreEqual(hydraulicBoundaryLocations.Count, hydraulicBoundaryLocationsGrassOutwards.Count);
+            AssertDesignWaterLevelValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocationsGrassOutwards);
+            AssertDesignWaterLevelConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(hydraulicBoundaryLocationsGrassOutwards);
+            AssertWaveHeightValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocationsGrassOutwards);
+            AssertWaveHeightConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(hydraulicBoundaryLocationsGrassOutwards);
 
-            AssertDesignWaterLevelValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(demoAssessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.ToArray());
-            AssertDesignWaterLevelConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(hydraulicBoundaryLocations);
-
-            AssertWaveHeightValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(demoAssessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.ToArray());
-            AssertWaveHeightConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(hydraulicBoundaryLocations);
-
             Assert.AreEqual(1, demoAssessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Count);
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = demoAssessmentSection.GrassCoverErosionOutwards
                                                                                                   .WaveConditionsCalculationGroup.GetCalculations()
@@ -211,7 +210,7 @@
             Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id);
         }
 
-        private static void AssertDesignWaterLevelValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(HydraulicBoundaryLocation[] locations)
+        private static void AssertDesignWaterLevelValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(ObservableList<HydraulicBoundaryLocation> locations)
         {
             Assert.AreEqual((RoundedDouble) 7.19, locations[0].DesignWaterLevel, locations[0].DesignWaterLevel.GetAccuracy());
             Assert.AreEqual((RoundedDouble) 7.19, locations[1].DesignWaterLevel, locations[1].DesignWaterLevel.GetAccuracy());
@@ -233,15 +232,15 @@
             Assert.AreEqual((RoundedDouble) 7.80, locations[17].DesignWaterLevel, locations[17].DesignWaterLevel.GetAccuracy());
         }
 
-        private static void AssertDesignWaterLevelConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(HydraulicBoundaryLocation[] locations)
+        private static void AssertDesignWaterLevelConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(ObservableList<HydraulicBoundaryLocation> locations)
         {
             foreach (HydraulicBoundaryLocation hydraulicBoundaryLocation in locations)
             {
-                Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
+                Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.CalculationConvergence);
             }
         }
 
-        private static void AssertWaveHeightValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(HydraulicBoundaryLocation[] locations)
+        private static void AssertWaveHeightValuesOnGrassCoverErosionOutwardsHydraulicBoundaryLocation(ObservableList<HydraulicBoundaryLocation> locations)
         {
             Assert.AreEqual((RoundedDouble) 4.99, locations[0].WaveHeight, locations[0].WaveHeight.GetAccuracy());
             Assert.AreEqual((RoundedDouble) 5.04, locations[1].WaveHeight, locations[1].WaveHeight.GetAccuracy());
@@ -263,11 +262,11 @@
             Assert.AreEqual((RoundedDouble) 5.34, locations[17].WaveHeight, locations[17].WaveHeight.GetAccuracy());
         }
 
-        private static void AssertWaveHeightConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(HydraulicBoundaryLocation[] locations)
+        private static void AssertWaveHeightConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(ObservableList<HydraulicBoundaryLocation> locations)
         {
             foreach (HydraulicBoundaryLocation hydraulicBoundaryLocation in locations)
             {
-                Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence);
+                Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.WaveHeightCalculation.Output.CalculationConvergence);
             }
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs
===================================================================
diff -u -rd25204b5728226909d03e56e21a954d4980c45c7 -r21247af98062ee0734c9c8a80f7dd7483463ee61
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision d25204b5728226909d03e56e21a954d4980c45c7)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 21247af98062ee0734c9c8a80f7dd7483463ee61)
@@ -91,11 +91,11 @@
         /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set for
         /// <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/>.
         /// </summary>
-        /// <param name="waveheight">The wave height result to set in the output.</param>
+        /// <param name="waveHeight">The wave height result to set in the output.</param>
         /// <returns>A new <see cref="TestHydraulicBoundaryLocation"/>.</returns>
-        public static TestHydraulicBoundaryLocation CreateWaveHeightCalculated(double waveheight)
+        public static TestHydraulicBoundaryLocation CreateWaveHeightCalculated(double waveHeight)
         {
-            return new TestHydraulicBoundaryLocation(null, waveheight);
+            return new TestHydraulicBoundaryLocation(null, waveHeight);
         }
     }
 }
\ No newline at end of file