Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r7acad0fffa8ab8be61368d034b41a5bf144c03a2 -r4a2950e3f38ca234030ac011f8fc24b5deab5787
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 7acad0fffa8ab8be61368d034b41a5bf144c03a2)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 4a2950e3f38ca234030ac011f8fc24b5deab5787)
@@ -89,10 +89,7 @@
         public void GetViewName_WithContext_ReturnsExpectedViewName()
         {
             // Setup
-            var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
-                                                                                           {
-                                                                                               TargetProbability = 0.01
-                                                                                           },
+            var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01),
                                                                                            new AssessmentSectionStub());
             using (var plugin = new RiskeerPlugin())
             {
@@ -127,7 +124,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
 
             var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculations, assessmentSection);
 
@@ -148,7 +145,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
-            var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+            var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
                                                                                            assessmentSection);
 
             using (var plugin = new RiskeerPlugin())
@@ -169,7 +166,7 @@
             // Setup
             var random = new Random();
 
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
@@ -213,9 +210,8 @@
         {
             // Setup
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
             {
-                TargetProbability = 0.01,
                 HydraulicBoundaryLocationCalculations =
                 {
                     hydraulicBoundaryLocationCalculation
@@ -284,10 +280,7 @@
 
             const double targetProbability = 0.01;
 
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability
-            {
-                TargetProbability = targetProbability
-            };
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability);
 
             var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculations, new AssessmentSectionStub());
 
@@ -316,13 +309,15 @@
         public void CloseViewForData_ForMatchingContext_ReturnsTrue()
         {
             // Setup
+            const double targetProbability = 0.01;
+
             var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability),
                 new AssessmentSectionStub());
 
             using (var view = new DesignWaterLevelCalculationsView(context.WrappedData.HydraulicBoundaryLocationCalculations,
                                                                    new AssessmentSectionStub(),
-                                                                   () => 0.01,
+                                                                   () => targetProbability,
                                                                    () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
@@ -342,15 +337,17 @@
         public void CloseViewForData_ForNonMatchingContext_ReturnsFalse()
         {
             // Setup
+            const double targetProbability = 0.01;
+
             var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability),
                 new AssessmentSectionStub());
 
             var otherCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
 
             using (var view = new DesignWaterLevelCalculationsView(otherCalculations,
                                                                    new AssessmentSectionStub(),
-                                                                   () => 0.01,
+                                                                   () => targetProbability,
                                                                    () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r7acad0fffa8ab8be61368d034b41a5bf144c03a2 -r4a2950e3f38ca234030ac011f8fc24b5deab5787
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 7acad0fffa8ab8be61368d034b41a5bf144c03a2)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 4a2950e3f38ca234030ac011f8fc24b5deab5787)
@@ -89,10 +89,7 @@
         public void GetViewName_WithContext_ReturnsExpectedViewName()
         {
             // Setup
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
-                                                                                           {
-                                                                                               TargetProbability = 0.01
-                                                                                           },
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01),
                                                                                            new AssessmentSectionStub());
             using (var plugin = new RiskeerPlugin())
             {
@@ -127,7 +124,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
 
             var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(calculations, assessmentSection);
 
@@ -148,7 +145,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
                                                                                            assessmentSection);
 
             using (var plugin = new RiskeerPlugin())
@@ -169,7 +166,7 @@
             // Setup
             var random = new Random();
 
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
@@ -213,9 +210,8 @@
         {
             // Setup
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
             {
-                TargetProbability = 0.01,
                 HydraulicBoundaryLocationCalculations =
                 {
                     hydraulicBoundaryLocationCalculation
@@ -284,10 +280,7 @@
 
             const double targetProbability = 0.01;
 
-            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability
-            {
-                TargetProbability = targetProbability
-            };
+            var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability);
 
             var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(calculations, new AssessmentSectionStub());
 
@@ -316,13 +309,15 @@
         public void CloseViewForData_ForMatchingContext_ReturnsTrue()
         {
             // Setup
+            const double targetProbability = 0.01;
+
             var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability),
                 new AssessmentSectionStub());
 
             using (var view = new WaveHeightCalculationsView(context.WrappedData.HydraulicBoundaryLocationCalculations,
                                                              new AssessmentSectionStub(),
-                                                             () => 0.01,
+                                                             () => targetProbability,
                                                              () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
@@ -342,15 +337,17 @@
         public void CloseViewForData_ForNonMatchingContext_ReturnsFalse()
         {
             // Setup
+            const double targetProbability = 0.01;
+
             var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability),
                 new AssessmentSectionStub());
 
             var otherCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
 
             using (var view = new WaveHeightCalculationsView(otherCalculations,
                                                              new AssessmentSectionStub(),
-                                                             () => 0.01,
+                                                             () => targetProbability,
                                                              () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {