Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision 77d25c75ebe120c39ed7956a0aace093ed96e135)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f)
@@ -45,10 +45,9 @@
         {
             // Setup
             var generalInputParameters = new GeneralPipingInput();
-            var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput();
 
             // Call
-            var calculation = new PipingCalculation(generalInputParameters, pipingProbabilityAssessmentInput);
+            var calculation = new PipingCalculation(generalInputParameters);
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
@@ -67,23 +66,13 @@
         public void Constructor_GeneralPipingInputIsNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new PipingCalculation(null, new PipingProbabilityAssessmentInput());
+            TestDelegate call = () => new PipingCalculation(null);
 
             // Assert
             Assert.Throws<ArgumentNullException>(call);
         }
 
         [Test]
-        public void Constructor_PipingProbabilisticAssessmentInputIsNull_ThrowArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => new PipingCalculation(new GeneralPipingInput(), null);
-
-            // Assert
-            Assert.Throws<ArgumentNullException>(call);
-        }
-
-        [Test]
         public void Notify_SingleListenerAttached_ListenerIsNotified()
         {
             // Setup
@@ -92,7 +81,7 @@
 
             mockRepository.ReplayAll();
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
+            var calculation = new PipingCalculation(new GeneralPipingInput());
 
             calculation.Attach(observer);
 
@@ -108,7 +97,7 @@
             observer.Expect(o => o.UpdateObserver()).Repeat.Never();
             mockRepository.ReplayAll();
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
+            var calculation = new PipingCalculation(new GeneralPipingInput());
 
             calculation.Attach(observer);
             calculation.Detach(observer);
@@ -129,7 +118,7 @@
 
             mockRepository.ReplayAll();
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
+            var calculation = new PipingCalculation(new GeneralPipingInput());
 
             calculation.Attach(observerA);
             calculation.Attach(observerB);
@@ -150,7 +139,7 @@
 
             mockRepository.ReplayAll();
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
+            var calculation = new PipingCalculation(new GeneralPipingInput());
 
             calculation.Attach(observerA);
             calculation.Attach(observerB);
@@ -165,9 +154,8 @@
         {
             // Setup
             var observer = mockRepository.StrictMock<IObserver>();
+            var calculation = new PipingCalculation(new GeneralPipingInput());
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
-
             // Call & Assert
             calculation.Detach(observer);
         }
@@ -176,7 +164,7 @@
         public void ClearOutput_Always_SetsOutputToNull()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())
+            var calculation = new PipingCalculation(new GeneralPipingInput())
             {
                 Output = new TestPipingOutput()
             };
@@ -192,7 +180,7 @@
         public void HasOutput_OutputNull_ReturnsFalse()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())
+            var calculation = new PipingCalculation(new GeneralPipingInput())
             {
                 Output = null
             };
@@ -205,7 +193,7 @@
         public void HasOutput_OutputSet_ReturnsTrue()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())
+            var calculation = new PipingCalculation(new GeneralPipingInput())
             {
                 Output = new TestPipingOutput()
             };
@@ -218,7 +206,7 @@
         public void ClearHydraulicBoundaryLocation_Always_SetHydraulicBoundaryLocationToNull()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
+            var calculation = new PipingCalculation(new GeneralPipingInput());
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0);
             calculation.InputParameters.HydraulicBoundaryLocation = hydraulicBoundaryLocation;
 
@@ -236,7 +224,7 @@
         public void ClearHydraulicBoundaryLocation_Always_SetAssessmentLevelToNaN()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
+            var calculation = new PipingCalculation(new GeneralPipingInput());
             var assessmentLevel = new RoundedDouble(2, 7.60);
             calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0)
             {
@@ -257,7 +245,7 @@
         public void GetObservableInput_Always_ReturnsInputParameters()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput());
+            var calculation = new PipingCalculation(new GeneralPipingInput());
             var inputParameters = calculation.InputParameters;
 
             // Call
@@ -272,7 +260,7 @@
         {
             // Setup
             var output = new PipingOutput(2.0, 3.0, 1.4, 50.3, 16.3, 58.2);
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())
+            var calculation = new PipingCalculation(new GeneralPipingInput())
             {
                 Output = output
             };