Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs
===================================================================
diff -u -rcd55f2dbdbd5bffff7d2417eb6d3e4f54ba66a47 -rf1876d31d910814fdf1d327c325fc1dfd6846c5e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision cd55f2dbdbd5bffff7d2417eb6d3e4f54ba66a47)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision f1876d31d910814fdf1d327c325fc1dfd6846c5e)
@@ -239,41 +239,33 @@
             {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
+                var assessmentSection = new ObservableTestAssessmentSectionStub
                 {
-                    Locations =
+                    HydraulicBoundaryDatabase =
                     {
-                        new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0)
+                        Locations =
+                        {
+                            new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0)
+                        }
                     }
                 };
-                var hydraulicBoundaryDatabase2 = new HydraulicBoundaryDatabase
-                {
-                    Locations =
-                    {
-                        new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)
-                    }
-                };
 
-                var assessmentSection = new ObservableTestAssessmentSectionStub
-                {
-                    HydraulicBoundaryDatabase = hydraulicBoundaryDatabase1
-                };
-
                 var failureMechanismContext = new FailureMechanismContext<TestFailureMechanism>(new TestFailureMechanism(), assessmentSection);
 
                 view.Data = failureMechanismContext;
 
                 MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(hydraulicBoundaryDatabase1.Locations, hydraulicBoundaryLocationsMapData);
+                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
 
                 // Call
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase2;
+                assessmentSection.HydraulicBoundaryDatabase.Locations.Clear();
+                assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0));
                 assessmentSection.NotifyObservers();
 
                 // Assert
-                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(hydraulicBoundaryDatabase2.Locations, hydraulicBoundaryLocationsMapData);
+                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
             }
         }
 
@@ -285,34 +277,32 @@
             {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                var assessmentSection = new ObservableTestAssessmentSectionStub
                 {
-                    Locations =
+                    HydraulicBoundaryDatabase =
                     {
-                        new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0)
+                        Locations =
+                        {
+                            new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0)
+                        }
                     }
                 };
 
-                var assessmentSection = new ObservableTestAssessmentSectionStub
-                {
-                    HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
-                };
-
                 var failureMechanismContext = new FailureMechanismContext<TestFailureMechanism>(new TestFailureMechanism(), assessmentSection);
 
                 view.Data = failureMechanismContext;
 
                 MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(hydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
+                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
 
                 // Call
-                hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 3.0, 4.0));
-                hydraulicBoundaryDatabase.NotifyObservers();
+                assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 3.0, 4.0));
+                assessmentSection.HydraulicBoundaryDatabase.NotifyObservers();
 
                 // Assert
-                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(hydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
+                MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
             }
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs
===================================================================
diff -u -r19d976fb7e64bc4c23ca6a601eb47d876b1fecff -rf1876d31d910814fdf1d327c325fc1dfd6846c5e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision 19d976fb7e64bc4c23ca6a601eb47d876b1fecff)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision f1876d31d910814fdf1d327c325fc1dfd6846c5e)
@@ -264,34 +264,24 @@
         {
             TestHydraulicBoundaryLocationsView view = ShowTestHydraulicBoundaryLocationsView();
 
-            var assessmentSection = new ObservableTestAssessmentSectionStub
+            view.Data = new[]
             {
-                HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
-            };
-
-            view.Data = assessmentSection.HydraulicBoundaryDatabase.Locations;
-        }
-
-        private class TestHydraulicBoundaryDatabase : HydraulicBoundaryDatabase
-        {
-            public TestHydraulicBoundaryDatabase()
-            {
-                Locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0));
-                Locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
+                new HydraulicBoundaryLocation(1, "1", 1.0, 1.0),
+                new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
                 {
                     DesignWaterLevelCalculation =
                     {
                         Output = new TestHydraulicBoundaryLocationOutput(1.23)
                     }
-                });
-                Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
+                },
+                new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
                 {
                     WaveHeightCalculation =
                     {
                         Output = new TestHydraulicBoundaryLocationOutput(2.45)
                     }
-                });
-                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                },
+                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
                 {
                     WaveHeightCalculation =
                     {
@@ -300,17 +290,10 @@
                             ShouldIllustrationPointsBeCalculated = true
                         }
                     }
-                });
-            }
+                }
+            };
         }
 
-        private class TestHydraulicBoundaryLocationRow : HydraulicBoundaryLocationRow
-        {
-            public TestHydraulicBoundaryLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                                    HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
-                : base(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation) {}
-        }
-
         private sealed class TestHydraulicBoundaryLocationsView : HydraulicBoundaryLocationsView
         {
             public TestHydraulicBoundaryLocationsView() : base(new ObservableTestAssessmentSectionStub()) {}