Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandlerTest.cs
===================================================================
diff -u -r073a9b42a3b5d87fcbfd3f5b6bb8b353e50c129b -r8c379b950333e45a56c901c937e705c8ac1e1c88
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandlerTest.cs	(.../HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandlerTest.cs)	(revision 073a9b42a3b5d87fcbfd3f5b6bb8b353e50c129b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandlerTest.cs	(.../HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandlerTest.cs)	(revision 8c379b950333e45a56c901c937e705c8ac1e1c88)
@@ -52,7 +52,7 @@
         {
             // Call
             var handler = new HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandler(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability());
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1));
 
             // Assert
             Assert.IsInstanceOf<IObservablePropertyChangeHandler>(handler);
@@ -63,7 +63,7 @@
         {
             // Setup
             var handler = new HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandler(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability());
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1));
 
             // Call
             void Call() => handler.SetPropertyValueAfterConfirmation(null);
@@ -89,7 +89,7 @@
             };
 
             var handler = new HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandler(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability());
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1));
 
             // Call
             handler.SetPropertyValueAfterConfirmation(() => {});
@@ -148,7 +148,7 @@
                 tester.ClickOk();
             };
 
-            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability
+            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
@@ -185,7 +185,7 @@
             };
 
             var handler = new HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandler(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability());
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1));
 
             var handlerExecuted = false;
 
@@ -232,7 +232,7 @@
             };
 
             var handler = new HydraulicBoundaryLocationCalculationsForTargetProbabilityChangeHandler(
-                new HydraulicBoundaryLocationCalculationsForTargetProbability());
+                new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1));
 
             var expectedException = new Exception();
 
@@ -258,7 +258,7 @@
                 Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble())
             };
 
-            return new HydraulicBoundaryLocationCalculationsForTargetProbability
+            return new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -r3cb5cf4da544396efd059517079d7ee462100e38 -r8c379b950333e45a56c901c937e705c8ac1e1c88
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision 3cb5cf4da544396efd059517079d7ee462100e38)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision 8c379b950333e45a56c901c937e705c8ac1e1c88)
@@ -439,7 +439,7 @@
 
             AssessmentSection targetAssessmentSection = CreateAssessmentSection(targetLocations);
             AssessmentSection sourceAssessmentSection = CreateAssessmentSection(sourceLocations);
-            
+
             sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01;
             sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01;
 
@@ -468,10 +468,10 @@
             // Then
             Assert.AreEqual(2, waterLevelTargetProbabilities.Count);
             Assert.AreEqual(2, waveHeightTargetProbabilities.Count);
-            
+
             Assert.AreEqual(1, waterLevelTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)));
             Assert.AreEqual(1, waveHeightTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)));
-            
+
             Assert.AreEqual(1, waterLevelTargetProbabilities.Count(c => c.TargetProbability.Equals(0.1)));
             Assert.AreEqual(1, waveHeightTargetProbabilities.Count(c => c.TargetProbability.Equals(0.1)));
         }
@@ -497,15 +497,15 @@
         private static AssessmentSection CreateAssessmentSection(HydraulicBoundaryLocation[] locations)
         {
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
                     new HydraulicBoundaryLocationCalculation(locations[0])
                 }
             });
 
-            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability
+            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01)
             {
                 HydraulicBoundaryLocationCalculations =
                 {
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs
===================================================================
diff -u -ra0eb7c959dff172cd86fd575d86edc481546ca17 -r8c379b950333e45a56c901c937e705c8ac1e1c88
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs)	(revision a0eb7c959dff172cd86fd575d86edc481546ca17)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs)	(revision 8c379b950333e45a56c901c937e705c8ac1e1c88)
@@ -56,7 +56,7 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
 
             var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability,
                                                                                            assessmentSection);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs
===================================================================
diff -u -ra0eb7c959dff172cd86fd575d86edc481546ca17 -r8c379b950333e45a56c901c937e705c8ac1e1c88
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs)	(revision a0eb7c959dff172cd86fd575d86edc481546ca17)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextPropertyInfoTest.cs)	(revision 8c379b950333e45a56c901c937e705c8ac1e1c88)
@@ -56,7 +56,7 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+            var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
 
             var context = new WaveHeightCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability,
                                                                                            assessmentSection);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rf7201fff47918e66edbdcb608a5a4410e441c618 -r8c379b950333e45a56c901c937e705c8ac1e1c88
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision f7201fff47918e66edbdcb608a5a4410e441c618)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 8c379b950333e45a56c901c937e705c8ac1e1c88)
@@ -104,10 +104,10 @@
                 };
 
                 // When
-                Action action = () => gui.SetProject(project, null);
+                void Action() => gui.SetProject(project, null);
 
                 // Then
-                TestHelper.AssertLogMessagesCount(action, 0);
+                TestHelper.AssertLogMessagesCount(Action, 0);
             }
 
             mocks.VerifyAll();
@@ -150,10 +150,10 @@
                 };
 
                 // When
-                Action action = () => gui.SetProject(project, null);
+                void Action() => gui.SetProject(project, null);
 
                 // Then
-                TestHelper.AssertLogMessagesCount(action, 0);
+                TestHelper.AssertLogMessagesCount(Action, 0);
             }
 
             mocks.VerifyAll();
@@ -192,14 +192,14 @@
                 };
 
                 // When
-                Action action = () => gui.SetProject(project, null);
+                void Action() => gui.SetProject(project, null);
 
                 // Then
-                string fileMissingMessage = $"Fout bij het lezen van bestand '{nonExistingFile}': het bestand bestaat niet.";
+                var fileMissingMessage = $"Fout bij het lezen van bestand '{nonExistingFile}': het bestand bestaat niet.";
                 string message = string.Format(
                     RiskeerCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
                     fileMissingMessage);
-                TestHelper.AssertLogMessageWithLevelIsGenerated(action, Tuple.Create(message, LogLevelConstant.Warn));
+                TestHelper.AssertLogMessageWithLevelIsGenerated(Action, Tuple.Create(message, LogLevelConstant.Warn));
             }
 
             mocks.VerifyAll();
@@ -755,10 +755,10 @@
             using (var plugin = new RiskeerPlugin())
             {
                 // Call
-                TestDelegate test = () => plugin.Activate();
+                void Call() => plugin.Activate();
 
                 // Assert
-                Assert.Throws<InvalidOperationException>(test);
+                Assert.Throws<InvalidOperationException>(Call);
             }
         }
 
@@ -777,7 +777,7 @@
                 SetPlugins(gui);
                 gui.Run();
 
-                var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+                var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
                 var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
                 {
                     WaterLevelCalculationsForUserDefinedTargetProbabilities =
@@ -830,7 +830,7 @@
                 SetPlugins(gui);
                 gui.Run();
 
-                var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability();
+                var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1);
                 var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
                 {
                     WaveHeightCalculationsForUserDefinedTargetProbabilities =