Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsOutputCalculationServiceTest.cs
===================================================================
diff -u -rb65d24ff4389f2f38904cc15d791cf93dd358b6e -r3739d94e5ef665dc97d80c8c3f7bc6ef4b19d93c
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsOutputCalculationServiceTest.cs	(.../GrassCoverErosionInwardsOutputCalculationServiceTest.cs)	(revision b65d24ff4389f2f38904cc15d791cf93dd358b6e)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsOutputCalculationServiceTest.cs	(.../GrassCoverErosionInwardsOutputCalculationServiceTest.cs)	(revision 3739d94e5ef665dc97d80c8c3f7bc6ef4b19d93c)
@@ -34,46 +34,70 @@
         [Test]
         public void Calculate_NullCalculation_ThrowsArgumentNullException()
         {
-            // Setup & Call
-            TestDelegate test = () => GrassCoverErosionInwardsOutputCalculationService.Calculate(null, double.NaN, double.NaN, double.NaN);
+            //Call
+            TestDelegate test = () => GrassCoverErosionInwardsOutputCalculationService.Calculate(null, double.NaN);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("calculation", exception.ParamName);
         }
 
         [Test]
-        [TestCase(30000, 100, 60000)]
-        [TestCase(30000, 24, 250000)]
-        [TestCase(20000, 100, 40000)]
-        [TestCase(20000, 24, 166666.6667)]
-        public void RequiredProbability_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, double expectedResult)
+        [TestCase(30000, 100, 2, 60000)]
+        [TestCase(30000, 100, 1, 30000)]
+        [TestCase(30000, 24, 2, 250000)]
+        [TestCase(30000, 24, 1, 125000)]
+        [TestCase(20000, 100, 2, 40000)]
+        [TestCase(20000, 100, 1, 20000)]
+        [TestCase(20000, 24, 2, 166666.6667)]
+        [TestCase(20000, 24, 1, 83333.33)]
+        public void RequiredProbability_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, int lengthEffectN, double expectedResult)
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new NormProbabilityInput())
+            {
+                NormProbabilityInput =
+                {
+                    Norm = norm,
+                    Contribution = contribution,
+                    N = lengthEffectN
+                }
+            };
 
             // Call
-            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, norm, contribution, double.NaN);
+            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, double.NaN);
 
             // Assert
             RoundedDouble output = calculation.Output.RequiredProbability;
             Assert.AreEqual(expectedResult, output, output.GetAccuracy());
         }
 
         [Test]
-        [TestCase(30000, 100, 4.149409984)]
-        [TestCase(30000, 24, 4.465183916)]
-        [TestCase(20000, 100, 4.055626981)]
-        [TestCase(20000, 24, 4.377587847)]
-        public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, double expectedResult)
+        [TestCase(30000, 100, 2, 4.149409984)]
+        [TestCase(30000, 100, 1, 3.987878937)]
+        [TestCase(30000, 24, 2, 4.465183916)]
+        [TestCase(30000, 24, 1, 4.314451022)]
+        [TestCase(20000, 100, 2, 4.055626981)]
+        [TestCase(20000, 100, 1, 3.890591886)]
+        [TestCase(20000, 24, 2, 4.377587847)]
+        [TestCase(20000, 24, 1, 4.2240038)]
+        public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, int lengthEffectN, double expectedResult)
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new NormProbabilityInput())
+            {
+                NormProbabilityInput =
+                {
+                    Norm = norm,
+                    Contribution = contribution,
+                    N = lengthEffectN
+                }
+            };
 
             // Call
-            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, norm, contribution, double.NaN);
+            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, double.NaN);
 
             // Assert
             RoundedDouble output = calculation.Output.RequiredReliability;
@@ -83,31 +107,31 @@
         [Test]
         [TestCase(1.23456, 1.23456)]
         [TestCase(789.123, 789.123)]
-        public void Reliability_DifferentInputs_ReturnsExpectedValue(double probability, double expectedResult)
+        public void Reliability_DifferentInputs_ReturnsExpectedValue(double reliability, double expectedResult)
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
                                                                       new NormProbabilityInput());
 
             // Call
-            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, double.NaN, double.NaN, probability);
+            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, reliability);
 
             // Assert
             RoundedDouble output = calculation.Output.Reliability;
             Assert.AreEqual(expectedResult, output, output.GetAccuracy());
         }
 
         [Test]
-        [TestCase(4, 7472.1535758)]
-        [TestCase(5, 672621.8295310)]
-        public void Probability_DifferentInputs_ReturnsExpectedValue(double probability, double expectedResult)
+        [TestCase(4, 31574.3855346)]
+        [TestCase(5, 3488555.78723)]
+        public void Probability_DifferentInputs_ReturnsExpectedValue(double reliability, double expectedResult)
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
                                                                       new NormProbabilityInput());
 
             // Call
-            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, double.NaN, double.NaN, probability);
+            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, reliability);
 
             // Assert
             RoundedDouble output = calculation.Output.Probability;
@@ -123,14 +147,21 @@
         [TestCase(20000, 100, 4.149409984, 1.023124169)]
         [TestCase(20000, 24, 4.107479655, 0.938297482)]
         [TestCase(20000, 24, 4.149409984, 0.947875892)]
-        public void FactorOfSafety_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, double probability, double expectedResult)
+        public void FactorOfSafety_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, double reliability, double expectedResult)
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new NormProbabilityInput())
+            {
+                NormProbabilityInput =
+                {
+                    Norm = norm,
+                    Contribution = contribution
+                }
+            };
 
             // Call
-            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, norm, contribution, probability);
+            GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, reliability);
 
             // Assert
             RoundedDouble output = calculation.Output.FactorOfSafety;