Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs
===================================================================
diff -u -r7128a1bcca4ef59f4cbd27b4726de50065732801 -r9e16393c81aeaccdcd50fcfbe4f45f1d934bf822
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 7128a1bcca4ef59f4cbd27b4726de50065732801)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 9e16393c81aeaccdcd50fcfbe4f45f1d934bf822)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -72,10 +73,27 @@
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresFailureMechanismView"/>.
         /// </summary>
-        public HeightStructuresFailureMechanismView()
+        /// <param name="failureMechanism">The failure mechanism to show the data for.</param>
+        /// <param name="assessmentSection">The assessment section to show data for.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public HeightStructuresFailureMechanismView(HeightStructuresFailureMechanism failureMechanism,
+                                                    IAssessmentSection assessmentSection)
         {
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanism));
+            }
+
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentSection));
+            }
+
             InitializeComponent();
 
+            FailureMechanism = failureMechanism;
+            AssessmentSection = assessmentSection;
+
             failureMechanismObserver = new Observer(UpdateMapData);
             assessmentSectionObserver = new Observer(UpdateMapData);
             hydraulicBoundaryLocationsObserver = new Observer(UpdateMapData);
@@ -112,6 +130,16 @@
             mapDataCollection.Add(calculationsMapData);
         }
 
+        /// <summary>
+        /// Gets the failure mechanism.
+        /// </summary>
+        public HeightStructuresFailureMechanism FailureMechanism { get; }
+
+        /// <summary>
+        /// Gets the assessment section.
+        /// </summary>
+        public IAssessmentSection AssessmentSection { get; }
+
         public object Data
         {
             get
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r81c929aa9cdf10afacb08e579363e587245f4b50 -r9e16393c81aeaccdcd50fcfbe4f45f1d934bf822
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 81c929aa9cdf10afacb08e579363e587245f4b50)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 9e16393c81aeaccdcd50fcfbe4f45f1d934bf822)
@@ -29,6 +29,7 @@
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using NUnit.Framework;
+using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
@@ -56,15 +57,49 @@
         private const int calculationsIndex = 7;
 
         [Test]
+        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate call = () => new HeightStructuresFailureMechanismView(null, assessmentSection);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+        }
+
+        [Test]
         public void Constructor_ExpectedValues()
         {
+            // Setup
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
+
             // Call
-            using (var view = new HeightStructuresFailureMechanismView())
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection))
             {
                 // Assert
                 Assert.IsInstanceOf<UserControl>(view);
                 Assert.IsInstanceOf<IMapView>(view);
                 Assert.IsNull(view.Data);
+                Assert.AreSame(failureMechanism, view.FailureMechanism);
+                Assert.AreSame(assessmentSection, view.AssessmentSection);
 
                 Assert.AreEqual(1, view.Controls.Count);
                 Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
@@ -78,12 +113,10 @@
         public void Data_HeightStructuresFailureMechanismContext_DataSet()
         {
             // Setup
-            using (var view = new HeightStructuresFailureMechanismView())
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub()))
             {
-                var assessmentSection = new ObservableTestAssessmentSectionStub();
-
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
-                    new HeightStructuresFailureMechanism(), assessmentSection);
+                    new HeightStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub());
 
                 // Call
                 view.Data = failureMechanismContext;
@@ -97,7 +130,7 @@
         public void Data_OtherThanHeightStructuresFailureMechanismContext_DataNull()
         {
             // Setup
-            using (var view = new HeightStructuresFailureMechanismView())
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub()))
             {
                 var data = new object();
 
@@ -115,7 +148,7 @@
             // Setup
             IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub();
 
-            using (var view = new HeightStructuresFailureMechanismView())
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection))
             {
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
@@ -132,10 +165,10 @@
         public void Data_SetToNull_MapDataCleared()
         {
             // Setup
-            using (var view = new HeightStructuresFailureMechanismView())
-            {
-                var assessmentSection = new ObservableTestAssessmentSectionStub();
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
 
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection))
+            {
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
 
@@ -159,10 +192,10 @@
         public void Data_EmptyHeightStructuresFailureMechanismContext_NoMapDataSet()
         {
             // Setup
-            using (var view = new HeightStructuresFailureMechanismView())
-            {
-                var assessmentSection = new ObservableTestAssessmentSectionStub();
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
 
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection))
+            {
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
 
@@ -180,85 +213,79 @@
         public void Data_HeightStructuresFailureMechanismContext_DataUpdatedToCollectionOfFilledMapData()
         {
             // Setup
-            using (var view = new HeightStructuresFailureMechanismView())
+            var calculationA = new StructuresCalculation<HeightStructuresInput>
             {
-                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
-
-                var geometryPoints = new[]
+                InputParameters =
                 {
-                    new Point2D(0.0, 0.0),
-                    new Point2D(2.0, 0.0),
-                    new Point2D(4.0, 4.0),
-                    new Point2D(6.0, 4.0)
-                };
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3),
+                    Structure = new TestHeightStructure(new Point2D(1.2, 2.3))
+                }
+            };
 
-                var referenceLine = new ReferenceLine();
-                referenceLine.SetGeometry(new[]
+            var calculationB = new StructuresCalculation<HeightStructuresInput>
+            {
+                InputParameters =
                 {
-                    new Point2D(1.0, 2.0),
-                    new Point2D(2.0, 1.0)
-                });
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 7.7, 12.6),
+                    Structure = new TestHeightStructure(new Point2D(2.7, 2.0))
+                }
+            };
 
-                var assessmentSection = new ObservableTestAssessmentSectionStub
-                {
-                    HydraulicBoundaryDatabase =
-                    {
-                        Locations =
-                        {
-                            new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)
-                        }
-                    },
-                    ReferenceLine = referenceLine
-                };
+            var geometryPoints = new[]
+            {
+                new Point2D(0.0, 0.0),
+                new Point2D(2.0, 0.0),
+                new Point2D(4.0, 4.0),
+                new Point2D(6.0, 4.0)
+            };
 
-                var calculationLocationA = new Point2D(1.2, 2.3);
-                var calculationLocationB = new Point2D(2.7, 2.0);
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("A", geometryPoints.Take(2)));
+            failureMechanism.AddSection(new FailureMechanismSection("B", geometryPoints.Skip(1).Take(2)));
+            failureMechanism.AddSection(new FailureMechanismSection("C", geometryPoints.Skip(2).Take(2)));
 
-                var hydraulicBoundaryLocationA = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3);
-                var hydraulicBoundaryLocationB = new HydraulicBoundaryLocation(1, string.Empty, 7.7, 12.6);
+            var profile1 = new TestForeshoreProfile("profile1 ID", new[]
+            {
+                new Point2D(0, 0),
+                new Point2D(1, 1)
+            });
+            var profile2 = new TestForeshoreProfile("profile2 ID", new[]
+            {
+                new Point2D(2, 2),
+                new Point2D(3, 3)
+            });
+            failureMechanism.ForeshoreProfiles.AddRange(new[]
+            {
+                profile1,
+                profile2
+            }, "path");
 
-                var calculationA = new StructuresCalculation<HeightStructuresInput>
-                {
-                    InputParameters =
-                    {
-                        HydraulicBoundaryLocation = hydraulicBoundaryLocationA,
-                        Structure = new TestHeightStructure(calculationLocationA)
-                    }
-                };
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
+            failureMechanism.CalculationsGroup.Children.Add(calculationB);
 
-                var calculationB = new StructuresCalculation<HeightStructuresInput>
+            var referenceLine = new ReferenceLine();
+            referenceLine.SetGeometry(new[]
+            {
+                new Point2D(1.0, 2.0),
+                new Point2D(2.0, 1.0)
+            });
+
+            var assessmentSection = new ObservableTestAssessmentSectionStub
+            {
+                HydraulicBoundaryDatabase =
                 {
-                    InputParameters =
+                    Locations =
                     {
-                        HydraulicBoundaryLocation = hydraulicBoundaryLocationB,
-                        Structure = new TestHeightStructure(calculationLocationB)
+                        new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)
                     }
-                };
+                },
+                ReferenceLine = referenceLine
+            };
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
-                failureMechanism.AddSection(new FailureMechanismSection("A", geometryPoints.Take(2)));
-                failureMechanism.AddSection(new FailureMechanismSection("B", geometryPoints.Skip(1).Take(2)));
-                failureMechanism.AddSection(new FailureMechanismSection("C", geometryPoints.Skip(2).Take(2)));
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection))
+            {
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var profile1 = new TestForeshoreProfile("profile1 ID", new[]
-                {
-                    new Point2D(0, 0),
-                    new Point2D(1, 1)
-                });
-                var profile2 = new TestForeshoreProfile("profile2 ID", new[]
-                {
-                    new Point2D(2, 2),
-                    new Point2D(3, 3)
-                });
-                failureMechanism.ForeshoreProfiles.AddRange(new[]
-                {
-                    profile1,
-                    profile2
-                }, "path");
-
-                failureMechanism.CalculationsGroup.Children.Add(calculationA);
-                failureMechanism.CalculationsGroup.Children.Add(calculationB);
-
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
                 // Call
@@ -289,21 +316,21 @@
         public void GivenViewWithHydraulicBoundarLocationsData_WhenHydraulicBoundaryLocationsUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var assessmentSection = new ObservableTestAssessmentSectionStub
             {
-                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
-
-                var assessmentSection = new ObservableTestAssessmentSectionStub
+                HydraulicBoundaryDatabase =
                 {
-                    HydraulicBoundaryDatabase =
+                    Locations =
                     {
-                        Locations =
-                        {
-                            new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0)
-                        }
+                        new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0)
                     }
-                };
+                }
+            };
 
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection))
+            {
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
+
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(),
                                                                                           assessmentSection);
 
@@ -329,23 +356,23 @@
         public void GivenViewWithHydraulicBoundaryLocationsData_WhenLocationUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            var random = new Random(21);
-            using (var view = new HeightStructuresFailureMechanismView())
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0);
+            var assessmentSection = new ObservableTestAssessmentSectionStub
             {
-                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
-
-                var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0);
-                var assessmentSection = new ObservableTestAssessmentSectionStub
+                HydraulicBoundaryDatabase =
                 {
-                    HydraulicBoundaryDatabase =
+                    Locations =
                     {
-                        Locations =
-                        {
-                            hydraulicBoundaryLocation
-                        }
+                        hydraulicBoundaryLocation
                     }
-                };
+                }
+            };
 
+            var random = new Random(21);
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection))
+            {
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
+
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), assessmentSection);
 
                 view.Data = failureMechanismContext;
@@ -377,28 +404,20 @@
         public void GivenViewWithReferenceLineData_WhenReferenceLineUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var assessmentSection = new ObservableTestAssessmentSectionStub
             {
+                ReferenceLine = new ReferenceLine()
+            };
+            assessmentSection.ReferenceLine.SetGeometry(new List<Point2D>
+            {
+                new Point2D(1.0, 2.0),
+                new Point2D(2.0, 1.0)
+            });
+
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection))
+            {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var points1 = new List<Point2D>
-                {
-                    new Point2D(1.0, 2.0),
-                    new Point2D(2.0, 1.0)
-                };
-
-                var points2 = new List<Point2D>
-                {
-                    new Point2D(2.0, 5.0),
-                    new Point2D(4.0, 3.0)
-                };
-
-                var assessmentSection = new ObservableTestAssessmentSectionStub
-                {
-                    ReferenceLine = new ReferenceLine()
-                };
-                assessmentSection.ReferenceLine.SetGeometry(points1);
-
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(),
                                                                                           assessmentSection);
 
@@ -411,7 +430,11 @@
                                                              referenceLineMapData);
 
                 // When
-                assessmentSection.ReferenceLine.SetGeometry(points2);
+                assessmentSection.ReferenceLine.SetGeometry(new List<Point2D>
+                {
+                    new Point2D(2.0, 5.0),
+                    new Point2D(4.0, 3.0)
+                });
                 assessmentSection.NotifyObservers();
 
                 // Then
@@ -424,11 +447,12 @@
         public void GivenViewWithFailureMechanismSectionsData_WhenFailureMechanismSectionsUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
             {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
-
-                var failureMechanism = new HeightStructuresFailureMechanism();
+                
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism,
                                                                                           new ObservableTestAssessmentSectionStub());
 
@@ -457,23 +481,24 @@
         public void GivenViewWithForeshoreProfileData_WhenForeshoreProfileUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var foreshoreProfile = new TestForeshoreProfile("originalProfile ID", new[]
             {
-                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
+                new Point2D(0, 0),
+                new Point2D(1, 1)
+            });
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
+            var failureMechanism = new HeightStructuresFailureMechanism();            
+            failureMechanism.ForeshoreProfiles.AddRange(new[]
+            {
+                foreshoreProfile
+            }, "path");
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
+            {
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
+                
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
 
-                var foreshoreProfile = new TestForeshoreProfile("originalProfile ID", new[]
-                {
-                    new Point2D(0, 0),
-                    new Point2D(1, 1)
-                });
-                failureMechanism.ForeshoreProfiles.AddRange(new[]
-                {
-                    foreshoreProfile
-                }, "path");
-
                 view.Data = failureMechanismContext;
 
                 MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex);
@@ -499,23 +524,23 @@
         public void GivenViewWithForeshoreProfilesData_WhenForeshoreProfilesUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.ForeshoreProfiles.AddRange(new[]
             {
+                new TestForeshoreProfile("originalProfile ID", new[]
+                {
+                    new Point2D(0, 0),
+                    new Point2D(1, 1)
+                })
+            }, "path");
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
+            {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism,
                                                                                           new ObservableTestAssessmentSectionStub());
 
-                failureMechanism.ForeshoreProfiles.AddRange(new[]
-                {
-                    new TestForeshoreProfile("originalProfile ID", new[]
-                    {
-                        new Point2D(0, 0),
-                        new Point2D(1, 1)
-                    })
-                }, "path");
-
                 view.Data = failureMechanismContext;
 
                 MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex);
@@ -545,20 +570,20 @@
         public void GivenViewWithStructureData_WhenStructureUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var structure = new TestHeightStructure(new Point2D(0, 0), "Id");
+            var failureMechanism = new HeightStructuresFailureMechanism();            
+            failureMechanism.HeightStructures.AddRange(new[]
             {
+                structure
+            }, "path");
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
+            {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism,
                                                                                           new ObservableTestAssessmentSectionStub());
 
-                var structure = new TestHeightStructure(new Point2D(0, 0), "Id");
-                failureMechanism.HeightStructures.AddRange(new[]
-                {
-                    structure
-                }, "path");
-
                 view.Data = failureMechanismContext;
 
                 MapData structuresData = map.Data.Collection.ElementAt(structuresIndex);
@@ -581,19 +606,19 @@
         public void GivenViewWithStructuresData_WhenStructuresUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.HeightStructures.AddRange(new[]
             {
+                new TestHeightStructure(new Point2D(0, 0), "Id1")
+            }, "path");
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
+            {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism,
-                                                                                          new ObservableTestAssessmentSectionStub());
+                                                                                          new ObservableTestAssessmentSectionStub());                
 
-                failureMechanism.HeightStructures.AddRange(new[]
-                {
-                    new TestHeightStructure(new Point2D(0, 0), "Id1")
-                }, "path");
-
                 view.Data = failureMechanismContext;
 
                 MapData structuresData = map.Data.Collection.ElementAt(structuresIndex);
@@ -619,40 +644,25 @@
         public void GivenViewWithCalculationGroupData_WhenCalculationGroupUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var calculationA = new StructuresCalculation<HeightStructuresInput>
             {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3),
+                    Structure = new TestHeightStructure(new Point2D(1.2, 2.3))
+                }
+            };
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
+            {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism,
                                                                                           new ObservableTestAssessmentSectionStub());
 
-                var calculationLocationA = new Point2D(1.2, 2.3);
-                var calculationLocationB = new Point2D(2.7, 2.0);
-
-                var hydraulicBoundaryLocationA = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3);
-                var hydraulicBoundaryLocationB = new HydraulicBoundaryLocation(1, string.Empty, 7.7, 12.6);
-
-                var calculationA = new StructuresCalculation<HeightStructuresInput>
-                {
-                    InputParameters =
-                    {
-                        HydraulicBoundaryLocation = hydraulicBoundaryLocationA,
-                        Structure = new TestHeightStructure(calculationLocationA)
-                    }
-                };
-
-                var calculationB = new StructuresCalculation<HeightStructuresInput>
-                {
-                    InputParameters =
-                    {
-                        HydraulicBoundaryLocation = hydraulicBoundaryLocationB,
-                        Structure = new TestHeightStructure(calculationLocationB)
-                    }
-                };
-
-                failureMechanism.CalculationsGroup.Children.Add(calculationA);
-
                 view.Data = failureMechanismContext;
 
                 var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex);
@@ -662,6 +672,14 @@
                                           calculationMapData);
 
                 // When
+                var calculationB = new StructuresCalculation<HeightStructuresInput>
+                {
+                    InputParameters =
+                    {
+                        HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 7.7, 12.6),
+                        Structure = new TestHeightStructure(new Point2D(2.7, 2.0))
+                    }
+                };
                 failureMechanism.CalculationsGroup.Children.Add(calculationB);
                 failureMechanism.CalculationsGroup.NotifyObservers();
 
@@ -675,29 +693,24 @@
         public void GivenViewWithCalculationInputData_WhenCalculationInputUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var calculationA = new StructuresCalculation<HeightStructuresInput>
             {
-                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3),
+                    Structure = new TestHeightStructure(new Point2D(1.2, 2.3))
+                }
+            };
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
+            {
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
+                
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism,
                                                                                           new ObservableTestAssessmentSectionStub());
 
-                var calculationLocationA = new Point2D(1.2, 2.3);
-                var calculationLocationB = new Point2D(2.7, 2.0);
-
-                var hydraulicBoundaryLocationA = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3);
-
-                var calculationA = new StructuresCalculation<HeightStructuresInput>
-                {
-                    InputParameters =
-                    {
-                        HydraulicBoundaryLocation = hydraulicBoundaryLocationA,
-                        Structure = new TestHeightStructure(calculationLocationA)
-                    }
-                };
-                failureMechanism.CalculationsGroup.Children.Add(calculationA);
-
                 view.Data = failureMechanismContext;
 
                 var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex);
@@ -707,7 +720,7 @@
                                           calculationMapData);
 
                 // When
-                calculationA.InputParameters.Structure = new TestHeightStructure(calculationLocationB);
+                calculationA.InputParameters.Structure = new TestHeightStructure(new Point2D(2.7, 2.0));
                 calculationA.InputParameters.NotifyObservers();
 
                 // Then
@@ -720,28 +733,25 @@
         public void GivenViewWithCalculationData_WhenCalculationUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
-            using (var view = new HeightStructuresFailureMechanismView())
+            var calculationA = new StructuresCalculation<HeightStructuresInput>
             {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3),
+                    Structure = new TestHeightStructure(new Point2D(1.2, 2.3))
+                }
+            };
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub()))
+            {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism,
                                                                                           new ObservableTestAssessmentSectionStub());
 
-                var calculationLocationA = new Point2D(1.2, 2.3);
-
-                var hydraulicBoundaryLocationA = new HydraulicBoundaryLocation(1, string.Empty, 1.3, 2.3);
-
-                var calculationA = new StructuresCalculation<HeightStructuresInput>
-                {
-                    InputParameters =
-                    {
-                        HydraulicBoundaryLocation = hydraulicBoundaryLocationA,
-                        Structure = new TestHeightStructure(calculationLocationA)
-                    }
-                };
-                failureMechanism.CalculationsGroup.Children.Add(calculationA);
-
                 view.Data = failureMechanismContext;
 
                 var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex);
@@ -773,12 +783,13 @@
             const int updatedStructuresLayerIndex = structuresIndex - 1;
             const int updatedCalculationsIndex = calculationsIndex - 1;
 
-            using (var view = new HeightStructuresFailureMechanismView())
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection))
             {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                var assessmentSection = new ObservableTestAssessmentSectionStub();
-                var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
                 view.Data = failureMechanismContext;
@@ -873,7 +884,7 @@
                 new HeightStructuresFailureMechanism(), oldAssessmentSection);
             var newHeightStructuresFailureMechanismContext = new HeightStructuresFailureMechanismContext(
                 new HeightStructuresFailureMechanism(), newAssessmentSection);
-            using (var view = new HeightStructuresFailureMechanismView())
+            using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), oldAssessmentSection))
             {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r81c929aa9cdf10afacb08e579363e587245f4b50 -r9e16393c81aeaccdcd50fcfbe4f45f1d934bf822
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs	(.../HeightStructuresFailureMechanismViewInfoTest.cs)	(revision 81c929aa9cdf10afacb08e579363e587245f4b50)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs	(.../HeightStructuresFailureMechanismViewInfoTest.cs)	(revision 9e16393c81aeaccdcd50fcfbe4f45f1d934bf822)
@@ -101,7 +101,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new HeightStructuresFailureMechanismView
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection)
             {
                 Data = failureMechanismContext
             })
@@ -125,7 +125,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new HeightStructuresFailureMechanismView
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection)
             {
                 Data = failureMechanismContext
             })
@@ -149,7 +149,7 @@
 
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new HeightStructuresFailureMechanismView
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection)
             {
                 Data = failureMechanismContext
             })
@@ -171,7 +171,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new HeightStructuresFailureMechanismView
+            using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection)
             {
                 Data = failureMechanismContext
             })