Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs
===================================================================
diff -u -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493 -rab5fe3ae7bb47d1648c200bc00f20e52512b15cb
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision ab5fe3ae7bb47d1648c200bc00f20e52512b15cb)
@@ -72,6 +72,9 @@
         /// </summary>
         public IHydraulicBoundaryLocationCalculationGuiService CalculationGuiService { get; set; }
 
+        /// <summary>
+        /// Gets or sets the <see cref="IAssessmentSection"/>.
+        /// </summary>
         public abstract IAssessmentSection AssessmentSection { get; set; }
 
         public virtual object Data
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs
===================================================================
diff -u -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493 -rab5fe3ae7bb47d1648c200bc00f20e52512b15cb
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs	(.../WaveHeightLocationRow.cs)	(revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs	(.../WaveHeightLocationRow.cs)	(revision ab5fe3ae7bb47d1648c200bc00f20e52512b15cb)
@@ -36,7 +36,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightLocationRow"/>.
         /// </summary>
-        /// <param name="hydraulicBoundaryLocation">The <see cref="Ringtoets.Common.Forms.PresentationObjects.HydraulicBoundaryLocation"/> for this row.</param>
+        /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> for this row.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
         public WaveHeightLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation) : base(hydraulicBoundaryLocation) { }
 
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs
===================================================================
diff -u -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493 -rab5fe3ae7bb47d1648c200bc00f20e52512b15cb
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs)	(revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs)	(revision ab5fe3ae7bb47d1648c200bc00f20e52512b15cb)
@@ -48,7 +48,7 @@
             }
             set
             {
-                var data = (IObservable) value;
+                var data = (ObservableList<HydraulicBoundaryLocation>) value;
                 base.Data = data;
                 hydraulicBoundaryLocationsObserver.Observable = data;
             }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493 -rab5fe3ae7bb47d1648c200bc00f20e52512b15cb
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision ab5fe3ae7bb47d1648c200bc00f20e52512b15cb)
@@ -24,6 +24,7 @@
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Forms.Views;
+using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
@@ -54,7 +55,7 @@
             }
             set
             {
-                var data = (IObservable) value;
+                var data = (ObservableList<HydraulicBoundaryLocation>) value;
                 base.Data = data;
                 hydraulicBoundaryLocationObserver.Observable = data;
             }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r94c00eb5839a1f1e96ebfe0d5c62f40e1d0ef500 -rab5fe3ae7bb47d1648c200bc00f20e52512b15cb
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 94c00eb5839a1f1e96ebfe0d5c62f40e1d0ef500)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision ab5fe3ae7bb47d1648c200bc00f20e52512b15cb)
@@ -322,7 +322,7 @@
 
         #endregion
 
-        #region: CloseDesignWaterLevelLocationsViewForData
+        #region CloseDesignWaterLevelLocationsViewForData
 
         private static bool CloseDesignWaterLevelLocationsViewForData(GrassCoverErosionOutwardsDesignWaterLevelLocationsView view, object dataToCloseFor)
         {
@@ -340,15 +340,13 @@
                 viewFailureMechanism = viewAssessmentSection.GetFailureMechanisms().OfType<GrassCoverErosionOutwardsFailureMechanism>().Single();
             }
 
-
             var failureMechanismContext = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanismContext;
             var assessmentSection = dataToCloseFor as IAssessmentSection;
             var failureMechanism = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanism;
             
             if (assessmentSection != null)
             {
                 failureMechanism = ((IAssessmentSection)dataToCloseFor).GetFailureMechanisms().OfType<GrassCoverErosionOutwardsFailureMechanism>().Single();
-                return failureMechanism != null && ReferenceEquals(failureMechanism, viewFailureMechanism);
             }
 
             if (failureMechanismContext != null)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -r94c00eb5839a1f1e96ebfe0d5c62f40e1d0ef500 -rab5fe3ae7bb47d1648c200bc00f20e52512b15cb
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs)	(revision 94c00eb5839a1f1e96ebfe0d5c62f40e1d0ef500)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs)	(revision ab5fe3ae7bb47d1648c200bc00f20e52512b15cb)
@@ -254,13 +254,17 @@
             // Setup
             var mocks = new MockRepository();
             var assessmentSectionA = mocks.Stub<IAssessmentSection>();
+            assessmentSectionA.Stub(a => a.GetFailureMechanisms()).Return(new[]
+            {
+                new GrassCoverErosionOutwardsFailureMechanism()
+            });
             mocks.ReplayAll();
 
             using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView())
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 var info = GetInfo(plugin);
-                view.Data = assessmentSectionA;
+                view.AssessmentSection = assessmentSectionA;
 
                 // Call
                 var closeForData = info.CloseForData(view, new object());
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -r94c00eb5839a1f1e96ebfe0d5c62f40e1d0ef500 -rab5fe3ae7bb47d1648c200bc00f20e52512b15cb
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs)	(revision 94c00eb5839a1f1e96ebfe0d5c62f40e1d0ef500)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs)	(revision ab5fe3ae7bb47d1648c200bc00f20e52512b15cb)
@@ -250,13 +250,17 @@
             // Setup
             var mocks = new MockRepository();
             var assessmentSectionA = mocks.Stub<IAssessmentSection>();
+            assessmentSectionA.Stub(a => a.GetFailureMechanisms()).Return(new[]
+            {
+                new GrassCoverErosionOutwardsFailureMechanism()
+            });
             mocks.ReplayAll();
 
             using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView())
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 var info = GetInfo(plugin);
-                view.Data = assessmentSectionA;
+                view.AssessmentSection = assessmentSectionA;
 
                 // Call
                 var closeForData = info.CloseForData(view, new object());