Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs
===================================================================
diff -u -r64a560fff80c88b04c926917ba917599ff9107f3 -rf30b28ba8332879439432de671bafccb02c723d6
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision 64a560fff80c88b04c926917ba917599ff9107f3)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision f30b28ba8332879439432de671bafccb02c723d6)
@@ -61,6 +61,8 @@
         private const int hydraulicBoundaryLocationsIndex = 1;
         private const int assemblyResultsIndex = 2;
 
+        private const int assemblyResultsObserverIndex = 1;
+
         [Test]
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
         {
@@ -196,7 +198,7 @@
                 var mocks = new MockRepository();
                 IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection);
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
-                observers[assemblyResultsIndex].Expect(obs => obs.UpdateObserver());
+                observers[assemblyResultsObserverIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
                 var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
@@ -228,7 +230,7 @@
 
                 var mocks = new MockRepository();
                 IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection);
-                observers[assemblyResultsIndex].Expect(obs => obs.UpdateObserver());
+                observers[assemblyResultsObserverIndex].Expect(obs => obs.UpdateObserver());
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
@@ -276,7 +278,7 @@
                     var mocks = new MockRepository();
                     IObserver[] observers = AttachMapDataObservers(mocks, mapData.Collection);
                     observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
-                    observers[assemblyResultsIndex].Expect(obs => obs.UpdateObserver());
+                    observers[assemblyResultsObserverIndex].Expect(obs => obs.UpdateObserver());
                     mocks.ReplayAll();
 
                     IEnumerable<CombinedFailureMechanismSectionAssemblyResult> expectedResults =
@@ -327,7 +329,7 @@
 
                     var mocks = new MockRepository();
                     IObserver[] observers = AttachMapDataObservers(mocks, mapData.Collection);
-                    observers[assemblyResultsIndex].Expect(obs => obs.UpdateObserver());
+                    observers[assemblyResultsObserverIndex].Expect(obs => obs.UpdateObserver());
                     observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                     mocks.ReplayAll();
 
@@ -546,16 +548,12 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var assemblyResultsObserver = mocks.StrictMock<IObserver>();
             mapDataArray[assemblyResultsIndex].Attach(assemblyResultsObserver);
 
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 assemblyResultsObserver
             };
         }
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs
===================================================================
diff -u -rf505e30c3f48282388f2c5a89e95dfc6e94236d9 -rf30b28ba8332879439432de671bafccb02c723d6
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs	(.../FailureMechanismWithDetailedAssessmentViewTest.cs)	(revision f505e30c3f48282388f2c5a89e95dfc6e94236d9)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs	(.../FailureMechanismWithDetailedAssessmentViewTest.cs)	(revision f30b28ba8332879439432de671bafccb02c723d6)
@@ -58,13 +58,13 @@
         private const int simpleAssemblyIndex = 2;
         private const int combinedAssemblyIndex = 3;
 
-        private const int sectionsObserverIndex = 2;
-        private const int sectionsStartPointObserverIndex = 3;
-        private const int sectionsEndPointObserverIndex = 4;
-        private const int simpleAssemblyObserverIndex = 5;
-        private const int detailedAssemblyObserverIndex = 6;
-        private const int tailorMadeAssemblyObserverIndex = 7;
-        private const int combinedAssemblyObserverIndex = 8;
+        private const int sectionsObserverIndex = 1;
+        private const int sectionsStartPointObserverIndex = 2;
+        private const int sectionsEndPointObserverIndex = 3;
+        private const int simpleAssemblyObserverIndex = 4;
+        private const int detailedAssemblyObserverIndex = 5;
+        private const int tailorMadeAssemblyObserverIndex = 6;
+        private const int combinedAssemblyObserverIndex = 7;
 
         [Test]
         public void Constructor_ExpectedValues()
@@ -783,9 +783,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             MapData[] sectionsCollection = ((MapDataCollection) mapDataArray[sectionsCollectionIndex]).Collection.ToArray();
             var sectionsMapDataObserver = mocks.StrictMock<IObserver>();
             sectionsCollection[sectionsIndex].Attach(sectionsMapDataObserver);
@@ -812,7 +809,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 sectionsMapDataObserver,
                 sectionsStartPointMapDataObserver,
                 sectionsEndPointMapDataObserver,
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithoutDetailedAssessmentViewTest.cs
===================================================================
diff -u -rd10f178db6d6df9f13e4c78c478ca73dbef9a94e -rf30b28ba8332879439432de671bafccb02c723d6
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithoutDetailedAssessmentViewTest.cs	(.../FailureMechanismWithoutDetailedAssessmentViewTest.cs)	(revision d10f178db6d6df9f13e4c78c478ca73dbef9a94e)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithoutDetailedAssessmentViewTest.cs	(.../FailureMechanismWithoutDetailedAssessmentViewTest.cs)	(revision f30b28ba8332879439432de671bafccb02c723d6)
@@ -57,12 +57,12 @@
         private const int simpleAssemblyIndex = 1;
         private const int combinedAssemblyIndex = 2;
 
-        private const int sectionsObserverIndex = 2;
-        private const int sectionsStartPointObserverIndex = 3;
-        private const int sectionsEndPointObserverIndex = 4;
-        private const int simpleAssemblyObserverIndex = 5;
-        private const int tailorMadeAssemblyObserverIndex = 6;
-        private const int combinedAssemblyObserverIndex = 7;
+        private const int sectionsObserverIndex = 1;
+        private const int sectionsStartPointObserverIndex = 2;
+        private const int sectionsEndPointObserverIndex = 3;
+        private const int simpleAssemblyObserverIndex = 4;
+        private const int tailorMadeAssemblyObserverIndex = 5;
+        private const int combinedAssemblyObserverIndex = 6;
 
         [Test]
         public void Constructor_ExpectedValues()
@@ -715,9 +715,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             MapData[] sectionsCollection = ((MapDataCollection) mapDataArray[sectionsCollectionIndex]).Collection.ToArray();
             var sectionsMapDataObserver = mocks.StrictMock<IObserver>();
             sectionsCollection[sectionsIndex].Attach(sectionsMapDataObserver);
@@ -741,7 +738,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 sectionsMapDataObserver,
                 sectionsStartPointMapDataObserver,
                 sectionsEndPointMapDataObserver,