Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -radcd83687e1563408db8f4649f2e18fa07c69c1d -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision adcd83687e1563408db8f4649f2e18fa07c69c1d)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -54,9 +54,9 @@
         private const int structuresIndex = 3;
         private const int calculationsIndex = 4;
 
-        private const int foreshoreProfilesObserverIndex = 2;
-        private const int structuresObserverIndex = 3;
-        private const int calculationObserverIndex = 4;
+        private const int foreshoreProfilesObserverIndex = 1;
+        private const int structuresObserverIndex = 2;
+        private const int calculationObserverIndex = 3;
 
         private Form testForm;
 
@@ -713,9 +713,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var foreshoreProfilesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver);
 
@@ -728,7 +725,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 foreshoreProfilesMapDataObserver,
                 structuresMapDataObserver,
                 calculationsMapDataObserver
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r6a1b056ca0b0a8aa6d1d3b6cee7144c8983c5634 -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision 6a1b056ca0b0a8aa6d1d3b6cee7144c8983c5634)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -53,9 +53,9 @@
         private const int foreshoreProfilesIndex = 3;
         private const int calculationsIndex = 4;
 
-        private const int dikeProfilesObserverIndex = 2;
-        private const int foreshoreProfileObserverIndex = 3;
-        private const int calculationObserverIndex = 4;
+        private const int dikeProfilesObserverIndex = 1;
+        private const int foreshoreProfileObserverIndex = 2;
+        private const int calculationObserverIndex = 3;
 
         private Form testForm;
 
@@ -715,9 +715,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var dikeProfilesObserver = mocks.StrictMock<IObserver>();
             mapDataArray[dikeProfilesIndex].Attach(dikeProfilesObserver);
 
@@ -730,7 +727,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 dikeProfilesObserver,
                 foreshoreProfilesObserver,
                 calculationsMapDataObserver
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r6f2c12ab2e1154360a34b52c4a4b09cdf1dd169e -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 6f2c12ab2e1154360a34b52c4a4b09cdf1dd169e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -52,8 +52,8 @@
         private const int foreshoreProfilesIndex = 2;
         private const int calculationsIndex = 3;
 
-        private const int foreshoreProfileObserverIndex = 2;
-        private const int calculationObserverIndex = 3;
+        private const int foreshoreProfileObserverIndex = 1;
+        private const int calculationObserverIndex = 2;
 
         private Form testForm;
 
@@ -665,9 +665,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var foreshoreProfilesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver);
 
@@ -677,7 +674,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 foreshoreProfilesMapDataObserver,
                 calculationsMapDataObserver
             };
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r5364d2edc281267773daa0b7d87ae3115fb6d7dd -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 5364d2edc281267773daa0b7d87ae3115fb6d7dd)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -54,9 +54,9 @@
         private const int structuresIndex = 3;
         private const int calculationsIndex = 4;
 
-        private const int foreshoreProfilesObserverIndex = 2;
-        private const int structuresObserverIndex = 3;
-        private const int calculationObserverIndex = 4;
+        private const int foreshoreProfilesObserverIndex = 1;
+        private const int structuresObserverIndex = 2;
+        private const int calculationObserverIndex = 3;
 
         private Form testForm;
 
@@ -713,9 +713,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var foreshoreProfilesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver);
 
@@ -728,7 +725,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 foreshoreProfilesMapDataObserver,
                 structuresMapDataObserver,
                 calculationsMapDataObserver
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -rdbc421df1f7ee833c3a098327c9b76c9b353ebe7 -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs	(.../MacroStabilityInwardsFailureMechanismViewTest.cs)	(revision dbc421df1f7ee833c3a098327c9b76c9b353ebe7)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs	(.../MacroStabilityInwardsFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -56,7 +56,7 @@
         private const int hydraulicBoundaryLocationsIndex = 3;
         private const int calculationsIndex = 4;
 
-        private const int calculationObserverIndex = 4;
+        private const int calculationObserverIndex = 3;
 
         private Form testForm;
 
@@ -762,9 +762,6 @@
             var surfaceLinesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[surfaceLinesIndex].Attach(surfaceLinesMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var calculationsMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[calculationsIndex].Attach(calculationsMapDataObserver);
 
@@ -773,7 +770,6 @@
                 referenceLineMapDataObserver,
                 stochasticSoilModelsMapDataObserver,
                 surfaceLinesMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 calculationsMapDataObserver
             };
         }
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r2c7157e9da4bc3e90cf2772cf394f566bf1a6edd -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 2c7157e9da4bc3e90cf2772cf394f566bf1a6edd)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -66,11 +66,11 @@
         private const int sectionsStartPointIndex = 1;
         private const int sectionsEndPointIndex = 2;
 
-        private const int semiProbabilisticCalculationObserverIndex = 4;
-        private const int probabilisticCalculationObserverIndex = 5;
-        private const int sectionsObserverIndex = 6;
-        private const int sectionsStartPointObserverIndex = 7;
-        private const int sectionsEndPointObserverIndex = 8;
+        private const int semiProbabilisticCalculationObserverIndex = 3;
+        private const int probabilisticCalculationObserverIndex = 4;
+        private const int sectionsObserverIndex = 5;
+        private const int sectionsStartPointObserverIndex = 6;
+        private const int sectionsEndPointObserverIndex = 7;
 
         private Form testForm;
 
@@ -994,9 +994,6 @@
             var surfaceLinesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[surfaceLinesIndex].Attach(surfaceLinesMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var probabilisticCalculationsMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[probabilisticCalculationsIndex].Attach(probabilisticCalculationsMapDataObserver);
 
@@ -1018,7 +1015,6 @@
                 referenceLineMapDataObserver,
                 stochasticSoilModelsMapDataObserver,
                 surfaceLinesMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 semiProbabilisticCalculationsMapDataObserver,
                 probabilisticCalculationsMapDataObserver,
                 sectionsMapDataObserver,
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -rda13093e7d1cdae6d3923f5ebdd8205117be65e3 -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision da13093e7d1cdae6d3923f5ebdd8205117be65e3)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -54,9 +54,9 @@
         private const int structuresIndex = 3;
         private const int calculationsIndex = 4;
 
-        private const int foreshoreProfilesObserverIndex = 2;
-        private const int structuresObserverIndex = 3;
-        private const int calculationObserverIndex = 4;
+        private const int foreshoreProfilesObserverIndex = 1;
+        private const int structuresObserverIndex = 2;
+        private const int calculationObserverIndex = 3;
 
         private Form testForm;
 
@@ -713,9 +713,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var foreshoreProfilesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver);
 
@@ -728,7 +725,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 foreshoreProfilesMapDataObserver,
                 structuresMapDataObserver,
                 calculationsMapDataObserver
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs
===================================================================
diff -u -ra7cf4a030610f7049990282c6ab18e7705ca118b -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision a7cf4a030610f7049990282c6ab18e7705ca118b)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -51,8 +51,8 @@
         private const int foreshoreProfilesIndex = 2;
         private const int calculationsIndex = 3;
 
-        private const int foreshoreProfileObserverIndex = 2;
-        private const int calculationObserverIndex = 3;
+        private const int foreshoreProfileObserverIndex = 1;
+        private const int calculationObserverIndex = 2;
 
         private Form testForm;
 
@@ -664,9 +664,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var foreshoreProfilesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver);
 
@@ -676,7 +673,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 foreshoreProfilesMapDataObserver,
                 calculationsMapDataObserver
             };
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs
===================================================================
diff -u -r5d0c87f9c1e18532d57811e71e821c5305041236 -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision 5d0c87f9c1e18532d57811e71e821c5305041236)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88)
@@ -51,8 +51,8 @@
         private const int foreshoreProfilesIndex = 2;
         private const int calculationsIndex = 3;
 
-        private const int foreshoreProfileObserverIndex = 2;
-        private const int calculationObserverIndex = 3;
+        private const int foreshoreProfileObserverIndex = 1;
+        private const int calculationObserverIndex = 2;
 
         private Form testForm;
 
@@ -664,9 +664,6 @@
             var referenceLineMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver);
 
-            var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock<IObserver>();
-            mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver);
-
             var foreshoreProfilesMapDataObserver = mocks.StrictMock<IObserver>();
             mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver);
 
@@ -676,7 +673,6 @@
             return new[]
             {
                 referenceLineMapDataObserver,
-                hydraulicBoundaryLocationsMapDataObserver,
                 foreshoreProfilesMapDataObserver,
                 calculationsMapDataObserver
             };