Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r01c40dbdf75bccae38a7728556afe2f8968f55c0 -r804225f41915e0527123816bc27c3f6d6d90b6fb
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs)	(revision 01c40dbdf75bccae38a7728556afe2f8968f55c0)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs)	(revision 804225f41915e0527123816bc27c3f6d6d90b6fb)
@@ -163,20 +163,32 @@
             // Setup
             var random = new Random();
 
+            var location1 = new TestHydraulicBoundaryLocation();
+            var location2 = new TestHydraulicBoundaryLocation();
+            var assessmentSection = new AssessmentSectionStub();
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    location1,
+                    location2
+                }
+            });
+
             var hydraulicBoundaryLocationCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>
             {
-                new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+                new HydraulicBoundaryLocationCalculation(location1)
                 {
                     Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
                 },
-                new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+                new HydraulicBoundaryLocationCalculation(location2)
                 {
                     Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
                 }
             };
 
             var context = new WaterLevelCalculationsForNormTargetProbabilityContext(hydraulicBoundaryLocationCalculations,
-                                                                                    new AssessmentSectionStub(),
+                                                                                    assessmentSection,
                                                                                     () => 0.01);
 
             using (var plugin = new RiskeerPlugin())
@@ -208,10 +220,18 @@
         {
             // Setup
             double GetNormFunc() => 0.01;
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var assessmentSection = new AssessmentSectionStub();
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    hydraulicBoundaryLocation
+                }
+            });
             assessmentSection.AddHydraulicBoundaryLocationCalculations(new[]
             {
-                new TestHydraulicBoundaryLocation()
+                hydraulicBoundaryLocation
             });
 
             IObservableEnumerable<HydraulicBoundaryLocationCalculation> calculations = getCalculationsFunc(assessmentSection);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r01c40dbdf75bccae38a7728556afe2f8968f55c0 -r804225f41915e0527123816bc27c3f6d6d90b6fb
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 01c40dbdf75bccae38a7728556afe2f8968f55c0)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 804225f41915e0527123816bc27c3f6d6d90b6fb)
@@ -163,23 +163,35 @@
         {
             // Setup
             var random = new Random();
+            
+            var location1 = new TestHydraulicBoundaryLocation();
+            var location2 = new TestHydraulicBoundaryLocation();
+            var assessmentSection = new AssessmentSectionStub();
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    location1,
+                    location2
+                }
+            });
 
             var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
-                    new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+                    new HydraulicBoundaryLocationCalculation(location1)
                     {
                         Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
                     },
-                    new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+                    new HydraulicBoundaryLocationCalculation(location2)
                     {
                         Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
                     }
                 }
             };
 
-            var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability, new AssessmentSectionStub());
+            var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability, assessmentSection);
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -207,7 +219,8 @@
         public void CreateInstance_WithContext_SetsExpectedCalculationData()
         {
             // Setup
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
             var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
             {
                 HydraulicBoundaryLocationCalculations =
@@ -217,6 +230,10 @@
             };
 
             var assessmentSection = new AssessmentSectionStub();
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
+            {
+                Locations = { hydraulicBoundaryLocation }
+            });
             assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(calculationsForTargetProbability);
 
             var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability, assessmentSection);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r01c40dbdf75bccae38a7728556afe2f8968f55c0 -r804225f41915e0527123816bc27c3f6d6d90b6fb
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 01c40dbdf75bccae38a7728556afe2f8968f55c0)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 804225f41915e0527123816bc27c3f6d6d90b6fb)
@@ -164,22 +164,34 @@
             // Setup
             var random = new Random();
 
+            var location1 = new TestHydraulicBoundaryLocation();
+            var location2 = new TestHydraulicBoundaryLocation();
+            var assessmentSection = new AssessmentSectionStub();
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    location1,
+                    location2
+                }
+            });
+
             var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
-                    new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+                    new HydraulicBoundaryLocationCalculation(location1)
                     {
                         Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
                     },
-                    new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+                    new HydraulicBoundaryLocationCalculation(location2)
                     {
                         Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
                     }
                 }
             };
 
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability, new AssessmentSectionStub());
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability, assessmentSection);
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -207,7 +219,9 @@
         public void CreateInstance_WithContext_SetsExpectedCalculationData()
         {
             // Setup
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
             var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
             {
                 HydraulicBoundaryLocationCalculations =
@@ -217,6 +231,13 @@
             };
 
             var assessmentSection = new AssessmentSectionStub();
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    hydraulicBoundaryLocation
+                }
+            });
             assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(calculationsForTargetProbability);
 
             var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability, assessmentSection);