Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48 -r9b48ccdd1f5893bd5951d2eefa2a0d643d853b32
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 9c5748ebe48d1499c78ecb4ac2c91850cd7c4e48)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 9b48ccdd1f5893bd5951d2eefa2a0d643d853b32)
@@ -102,10 +102,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
-                                                                                           {
-                                                                                               TargetProbability = 0.01
-                                                                                           },
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01),
                                                                                            assessmentSection);
 
             using (var plugin = new RiskeerPlugin())
@@ -181,8 +178,8 @@
 
             mockRepository.ReplayAll();
 
-            var calculationForFirstTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
-            var calculationForSecondTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+            var calculationForFirstTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
+            var calculationForSecondTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01);
             var calculations = new ObservableList<HydraulicBoundaryLocationCalculationsForTargetProbability>
             {
                 calculationForFirstTargetProbability,
@@ -232,7 +229,7 @@
                 menuBuilder.Expect(mb => mb.Build()).Return(null);
             }
 
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
                                                                                             assessmentSection);
 
             using (var treeViewControl = new TreeViewControl())
@@ -263,7 +260,7 @@
             // Setup
             IAssessmentSection assessmentSection = new AssessmentSectionStub();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
                                                                                             assessmentSection);
 
             using (var treeViewControl = new TreeViewControl())
@@ -310,7 +307,7 @@
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository);
 
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
                                                                                             assessmentSection);
 
             using (var treeViewControl = new TreeViewControl())
@@ -349,7 +346,7 @@
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mockRepository, "invalidFilePath");
 
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
                                                                                             assessmentSection);
 
             using (var treeViewControl = new TreeViewControl())
@@ -395,7 +392,7 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(),
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
                                                                                             assessmentSection);
 
             using (var treeViewControl = new TreeViewControl())
@@ -444,7 +441,7 @@
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository);
 
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
                                                                                             {
                                                                                                 HydraulicBoundaryLocationCalculations =
                                                                                                 {
@@ -498,7 +495,7 @@
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mockRepository, "invalidFilePath");
 
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
                                                                                             {
                                                                                                 HydraulicBoundaryLocationCalculations =
                                                                                                 {
@@ -552,9 +549,8 @@
 
             const double targetProbability = 0.01;
 
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability)
                                                                                            {
-                                                                                               TargetProbability = targetProbability,
                                                                                                HydraulicBoundaryLocationCalculations =
                                                                                                {
                                                                                                    new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
@@ -637,9 +633,8 @@
 
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName");
 
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability)
                                                                                            {
-                                                                                               TargetProbability = targetProbability,
                                                                                                HydraulicBoundaryLocationCalculations =
                                                                                                {
                                                                                                    new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
@@ -721,9 +716,8 @@
 
             const double targetProbability = 0.01;
 
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability)
                                                                                            {
-                                                                                               TargetProbability = targetProbability,
                                                                                                HydraulicBoundaryLocationCalculations =
                                                                                                {
                                                                                                    new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
@@ -797,9 +791,8 @@
 
             var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation("locationName"));
 
-            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
                                                                                            {
-                                                                                               TargetProbability = 0.01,
                                                                                                HydraulicBoundaryLocationCalculations =
                                                                                                {
                                                                                                    calculation
@@ -891,9 +884,8 @@
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mockRepository, "invalidFilePath");
 
-            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var nodeData = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
                                                                                             {
-                                                                                                TargetProbability = 0.01,
                                                                                                 HydraulicBoundaryLocationCalculations =
                                                                                                 {
                                                                                                     calculation
@@ -934,7 +926,7 @@
                         contextMenu.Items[contextMenuClearIllustrationPointsIndex].PerformClick();
 
                         // Then
-                        string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij '1/100' wilt wissen?";
+                        var expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij '1/100' wilt wissen?";
                         Assert.AreEqual(expectedMessage, messageBoxText);
 
                         Assert.IsTrue(calculation.HasOutput);
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -re8e2fd4ff1644db11baf86237b79b1a86046db99 -r9b48ccdd1f5893bd5951d2eefa2a0d643d853b32
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision e8e2fd4ff1644db11baf86237b79b1a86046db99)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 9b48ccdd1f5893bd5951d2eefa2a0d643d853b32)
@@ -204,15 +204,15 @@
             assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange(
                 new[]
                 {
-                    new HydraulicBoundaryLocationCalculationsForTargetProbability(),
-                    new HydraulicBoundaryLocationCalculationsForTargetProbability()
+                    new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1),
+                    new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
                 });
 
             assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.AddRange(
                 new[]
                 {
-                    new HydraulicBoundaryLocationCalculationsForTargetProbability(),
-                    new HydraulicBoundaryLocationCalculationsForTargetProbability()
+                    new HydraulicBoundaryLocationCalculationsForTargetProbability(0.025),
+                    new HydraulicBoundaryLocationCalculationsForTargetProbability(0.0025)
                 });
 
             assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations);
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -r0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc -r9b48ccdd1f5893bd5951d2eefa2a0d643d853b32
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 9b48ccdd1f5893bd5951d2eefa2a0d643d853b32)
@@ -456,8 +456,8 @@
                 }
             };
 
-            var waterLevelCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
-            var waveHeightCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+            var waterLevelCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
+            var waveHeightCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01);
 
             assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange(new[]
             {
@@ -564,7 +564,7 @@
                 Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
             };
 
-            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -r303c565eb1e9b87cfbc70b29f88d746cff92551e -r9b48ccdd1f5893bd5951d2eefa2a0d643d853b32
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 303c565eb1e9b87cfbc70b29f88d746cff92551e)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 9b48ccdd1f5893bd5951d2eefa2a0d643d853b32)
@@ -80,15 +80,15 @@
                 }
             };
 
-            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
                     new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
                 }
             });
 
-            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
             {
                 HydraulicBoundaryLocationCalculations =
                 {