Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.Designer.cs
===================================================================
diff -u
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.Designer.cs	(revision 0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.Designer.cs	(revision 860456f6b63623abee26e389444876d936864351)
@@ -0,0 +1,64 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Riskeer.Integration.Forms.Views
+{
+    partial class AssessmentSectionExtendedView
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.riskeerMapControl = new Riskeer.Common.Forms.Views.RiskeerMapControl();
+            this.SuspendLayout();
+            // 
+            // riskeerMapControl
+            // 
+            this.riskeerMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.riskeerMapControl.Location = new System.Drawing.Point(0, 0);
+            this.riskeerMapControl.Name = "riskeerMapControl";
+            this.riskeerMapControl.Size = new System.Drawing.Size(150, 150);
+            this.riskeerMapControl.TabIndex = 0;
+            // 
+            // AssessmentSectionView
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.riskeerMapControl);
+            this.Name = "AssessmentSectionExtendedView";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Riskeer.Common.Forms.Views.RiskeerMapControl riskeerMapControl;
+    }
+}
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs
===================================================================
diff -u
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs	(revision 0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs	(revision 860456f6b63623abee26e389444876d936864351)
@@ -0,0 +1,137 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Core.Components.Gis.Data;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Common.Forms.Factories;
+using Riskeer.Common.Forms.Helpers;
+
+namespace Riskeer.Integration.Forms.Views
+{
+    /// <summary>
+    /// This class is an extended view showing map data for an assessment section.
+    /// </summary>
+    public partial class AssessmentSectionExtendedView : AssessmentSectionReferenceLineView
+    {
+        private readonly IAssessmentSection assessmentSection;
+
+        private readonly MapPointData hydraulicBoundaryLocationsMapData;
+
+        private Observer hydraulicBoundaryLocationsObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waterLevelCalculationsForFactorizedSignalingNormObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waterLevelCalculationsForSignalingNormObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waterLevelCalculationsForLowerLimitNormObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waterLevelCalculationsForFactorizedLowerLimitNormObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waveHeightCalculationsForFactorizedSignalingNormObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waveHeightCalculationsForSignalingNormObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waveHeightCalculationsForLowerLimitNormObserver;
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> waveHeightCalculationsForFactorizedLowerLimitNormObserver;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="AssessmentSectionExtendedView"/>.
+        /// </summary>
+        /// <param name="assessmentSection">The assessment section to show the data for.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="assessmentSection"/>
+        /// is <c>null</c>.</exception>
+        public AssessmentSectionExtendedView(IAssessmentSection assessmentSection) : base(assessmentSection)
+        {
+            InitializeComponent();
+
+            this.assessmentSection = assessmentSection;
+
+            CreateObservers();
+
+            hydraulicBoundaryLocationsMapData = RiskeerMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
+
+            MapDataCollection.Add(hydraulicBoundaryLocationsMapData);
+
+            SetAllMapDataFeatures();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            waterLevelCalculationsForFactorizedSignalingNormObserver.Dispose();
+            waterLevelCalculationsForSignalingNormObserver.Dispose();
+            waterLevelCalculationsForLowerLimitNormObserver.Dispose();
+            waterLevelCalculationsForFactorizedLowerLimitNormObserver.Dispose();
+            waveHeightCalculationsForFactorizedSignalingNormObserver.Dispose();
+            waveHeightCalculationsForSignalingNormObserver.Dispose();
+            waveHeightCalculationsForLowerLimitNormObserver.Dispose();
+            waveHeightCalculationsForFactorizedLowerLimitNormObserver.Dispose();
+            hydraulicBoundaryLocationsObserver.Dispose();
+
+            if (disposing)
+            {
+                components?.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void CreateObservers()
+        {
+            waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+            waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+            waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+            waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+            waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+            waveHeightCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaveHeightCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+            waveHeightCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaveHeightCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+            waveHeightCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
+                assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+
+            hydraulicBoundaryLocationsObserver = new Observer(UpdateHydraulicBoundaryLocationsMapData)
+            {
+                Observable = assessmentSection.HydraulicBoundaryDatabase.Locations
+            };
+        }
+
+        private void SetAllMapDataFeatures()
+        {
+            SetHydraulicBoundaryLocationsMapData();
+        }
+
+        #region HydraulicBoundaryLocations MapData
+
+        private void UpdateHydraulicBoundaryLocationsMapData()
+        {
+            SetHydraulicBoundaryLocationsMapData();
+            hydraulicBoundaryLocationsMapData.NotifyObservers();
+        }
+
+        private void SetHydraulicBoundaryLocationsMapData()
+        {
+            hydraulicBoundaryLocationsMapData.Features = RiskeerMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(assessmentSection);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.resx
===================================================================
diff -u
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.resx	(revision 0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.resx	(revision 860456f6b63623abee26e389444876d936864351)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionReferenceLineView.Designer.cs
===================================================================
diff -u -rd04957276dbeb07bf0ab6189ad7d77385b8f20ca -r860456f6b63623abee26e389444876d936864351
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionReferenceLineView.Designer.cs	(.../AssessmentSectionReferenceLineView.Designer.cs)	(revision d04957276dbeb07bf0ab6189ad7d77385b8f20ca)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionReferenceLineView.Designer.cs	(.../AssessmentSectionReferenceLineView.Designer.cs)	(revision 860456f6b63623abee26e389444876d936864351)
@@ -47,7 +47,7 @@
             this.riskeerMapControl.Size = new System.Drawing.Size(150, 150);
             this.riskeerMapControl.TabIndex = 0;
             // 
-            // AssessmentSectionView
+            // AssessmentSectionReferenceLineView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
Fisheye: Tag 860456f6b63623abee26e389444876d936864351 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionView.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 860456f6b63623abee26e389444876d936864351 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 860456f6b63623abee26e389444876d936864351 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionView.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionExtendedViewTest.cs
===================================================================
diff -u -r24dadd7f736e8b0c9cd420a1def367e5c51e4ad2 -r860456f6b63623abee26e389444876d936864351
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionExtendedViewTest.cs	(.../AssessmentSectionExtendedViewTest.cs)	(revision 24dadd7f736e8b0c9cd420a1def367e5c51e4ad2)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionExtendedViewTest.cs	(.../AssessmentSectionExtendedViewTest.cs)	(revision 860456f6b63623abee26e389444876d936864351)
@@ -59,42 +59,10 @@
             AssessmentSectionExtendedView extendedView = ShowCalculationsView(assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<UserControl>(extendedView);
-            Assert.IsInstanceOf<IMapView>(extendedView);
-            Assert.IsNull(extendedView.Data);
-
-            Assert.AreEqual(2, extendedView.Controls.Count);
-            Assert.IsInstanceOf<RiskeerMapControl>(extendedView.Controls[0]);
-            Assert.AreSame(extendedView.Map, ((RiskeerMapControl) extendedView.Controls[0]).MapControl);
-            Assert.AreEqual(DockStyle.Fill, ((Control) extendedView.Map).Dock);
-            AssertEmptyMapData(extendedView.Map.Data);
+            Assert.IsInstanceOf<AssessmentSectionReferenceLineView>(extendedView);
         }
 
         [Test]
-        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => new AssessmentSectionExtendedView(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("assessmentSection", exception.ParamName);
-        }
-
-        [Test]
-        public void Constructor_AssessmentSectionWithBackgroundData_BackgroundDataSet()
-        {
-            // Setup
-            var assessmentSection = new AssessmentSectionStub();
-
-            // Call
-            AssessmentSectionExtendedView extendedView = ShowCalculationsView(assessmentSection);
-
-            // Assert
-            MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, extendedView.Map.BackgroundMapData);
-        }
-
-        [Test]
         public void Constructor_WithReferenceLineAndHydraulicBoundaryDatabase_DataUpdatedToCollectionOfFilledMapData()
         {
             // Setup
@@ -126,7 +94,8 @@
             MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
 
             MapData referenceLineMapData = mapData.Collection.ElementAt(referenceLineIndex);
-            AssertReferenceLineMapData(referenceLine, referenceLineMapData);
+            MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);
+            Assert.IsTrue(referenceLineMapData.IsVisible);
         }
 
         [Test]
@@ -202,87 +171,6 @@
         }
 
         [Test]
-        public void UpdateObserver_AssessmentSectionUpdated_MapDataUpdated()
-        {
-            // Setup
-            var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(new List<Point2D>
-            {
-                new Point2D(1.0, 2.0),
-                new Point2D(2.0, 1.0)
-            });
-
-            var assessmentSection = new AssessmentSectionStub
-            {
-                ReferenceLine = referenceLine
-            };
-
-            AssessmentSectionExtendedView extendedView = ShowCalculationsView(assessmentSection);
-            IMapControl map = ((RiskeerMapControl) extendedView.Controls[0]).MapControl;
-
-            var mocks = new MockRepository();
-            IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection);
-            observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
-            mocks.ReplayAll();
-
-            var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
-
-            // Precondition
-            MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
-            AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
-
-            // Call
-            assessmentSection.Name = "New name";
-            assessmentSection.NotifyObservers();
-
-            // Assert
-            MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
-            mocks.VerifyAll();
-        }
-
-        [Test]
-        public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
-        {
-            // Setup
-            var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(new List<Point2D>
-            {
-                new Point2D(1.0, 2.0),
-                new Point2D(2.0, 1.0)
-            });
-
-            var assessmentSection = new AssessmentSectionStub
-            {
-                ReferenceLine = referenceLine
-            };
-
-            AssessmentSectionExtendedView extendedView = ShowCalculationsView(assessmentSection);
-            IMapControl map = ((RiskeerMapControl) extendedView.Controls[0]).MapControl;
-
-            var mocks = new MockRepository();
-            IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection);
-            observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
-            mocks.ReplayAll();
-
-            MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
-
-            // Precondition
-            AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
-
-            // Call
-            referenceLine.SetGeometry(new List<Point2D>
-            {
-                new Point2D(2.0, 5.0),
-                new Point2D(4.0, 3.0)
-            });
-            referenceLine.NotifyObservers();
-
-            // Assert
-            AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void UpdateObserver_DataUpdated_MapLayersSameOrder()
         {
             // Setup
@@ -345,12 +233,6 @@
             testForm.Dispose();
         }
 
-        private static void AssertReferenceLineMapData(ReferenceLine referenceLine, MapData referenceLineMapData)
-        {
-            MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);
-            Assert.IsTrue(referenceLineMapData.IsVisible);
-        }
-
         private static void AssertEmptyMapData(MapDataCollection mapDataCollection)
         {
             Assert.AreEqual("Trajectkaart", mapDataCollection.Name);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionReferenceLineViewTest.cs
===================================================================
diff -u -r60b0b93589099f5f331ebf12aa2d5e646d325963 -r860456f6b63623abee26e389444876d936864351
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionReferenceLineViewTest.cs	(.../AssessmentSectionReferenceLineViewTest.cs)	(revision 60b0b93589099f5f331ebf12aa2d5e646d325963)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionReferenceLineViewTest.cs	(.../AssessmentSectionReferenceLineViewTest.cs)	(revision 860456f6b63623abee26e389444876d936864351)
@@ -117,7 +117,8 @@
             Assert.IsNotNull(mapData);
 
             MapData referenceLineMapData = mapData.Collection.ElementAt(referenceLineIndex);
-            AssertReferenceLineMapData(referenceLine, referenceLineMapData);
+            MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);
+            Assert.IsTrue(referenceLineMapData.IsVisible);
         }
 
         [Test]
@@ -149,7 +150,8 @@
 
             // Precondition
             MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
-            AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
+            MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);
+            Assert.IsTrue(referenceLineMapData.IsVisible);
 
             // Call
             assessmentSection.Name = "New name";
@@ -188,7 +190,8 @@
             MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
 
             // Precondition
-            AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
+            MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);
+            Assert.IsTrue(referenceLineMapData.IsVisible);
 
             // Call
             referenceLine.SetGeometry(new List<Point2D>
@@ -199,14 +202,9 @@
             referenceLine.NotifyObservers();
 
             // Assert
-            AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
-            mocks.VerifyAll();
-        }
-
-        private static void AssertReferenceLineMapData(ReferenceLine referenceLine, MapData referenceLineMapData)
-        {
             MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);
             Assert.IsTrue(referenceLineMapData.IsVisible);
+            mocks.VerifyAll();
         }
 
         private static void AssertEmptyMapData(MapDataCollection mapDataCollection)
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionExtendedViewInfoTest.cs
===================================================================
diff -u -r24dadd7f736e8b0c9cd420a1def367e5c51e4ad2 -r860456f6b63623abee26e389444876d936864351
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionExtendedViewInfoTest.cs	(.../AssessmentSectionExtendedViewInfoTest.cs)	(revision 24dadd7f736e8b0c9cd420a1def367e5c51e4ad2)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionExtendedViewInfoTest.cs	(.../AssessmentSectionExtendedViewInfoTest.cs)	(revision 860456f6b63623abee26e389444876d936864351)
@@ -69,7 +69,7 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsExpectedIcon()
         {
             // Call
             Image image = info.Image;
@@ -79,7 +79,7 @@
         }
 
         [Test]
-        public void CreateInstance_WithAssessmentSection_ReturnsAssessmentSectionView()
+        public void CreateInstance_WithAssessmentSection_ReturnsAssessmentSectionExtendedView()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionStateRootContextViewInfoTest.cs
===================================================================
diff -u -r1c5bb8a344ba13e3d1a952b26ac771e46f937754 -r860456f6b63623abee26e389444876d936864351
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionStateRootContextViewInfoTest.cs	(.../AssessmentSectionStateRootContextViewInfoTest.cs)	(revision 1c5bb8a344ba13e3d1a952b26ac771e46f937754)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionStateRootContextViewInfoTest.cs	(.../AssessmentSectionStateRootContextViewInfoTest.cs)	(revision 860456f6b63623abee26e389444876d936864351)
@@ -71,7 +71,7 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsExpectedIcon()
         {
             // Call
             Image image = info.Image;
@@ -81,7 +81,7 @@
         }
 
         [Test]
-        public void CreateInstance_WithAssessmentSection_ReturnsAssessmentSectionView()
+        public void CreateInstance_WithContext_ReturnsAssessmentSectionReferenceLineView()
         {
             // Setup
             var assessmentSectionStateRootContext = new AssessmentSectionStateRootContext(new AssessmentSection(AssessmentSectionComposition.Dike));