Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r2a896243ca24205f8e98db1b61e8148d1d9b9062 -r8e8f8c83c45656f65adaa8e47600379dc5ae8f61
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 2a896243ca24205f8e98db1b61e8148d1d9b9062)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 8e8f8c83c45656f65adaa8e47600379dc5ae8f61)
@@ -358,7 +358,8 @@
         [Test]
         [TestCaseSource(nameof(DistributionsWithInvalidDeviation))]
         public void Validate_DistributionStandardDeviationInvalid_LogsErrorAndReturnsFalse(double deviationOne, double deviationTwo,
-                                                                                           double deviationThree, double deviationFour, string parameterName)
+                                                                                           double deviationThree, double deviationFour,
+                                                                                           double deviationFive, string parameterName)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -383,6 +384,7 @@
             calculation.InputParameters.LevelCrestStructure.StandardDeviation = (RoundedDouble) deviationTwo;
             calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation = (RoundedDouble) deviationThree;
             calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation = (RoundedDouble) deviationFour;
+            calculation.InputParameters.WidthFlowApertures.StandardDeviation = (RoundedDouble) deviationFive;
 
             // Call
             bool isValid = false;
@@ -405,7 +407,7 @@
         [Test]
         [TestCaseSource(nameof(DistributionsWithInvalidCoefficient))]
         public void Validate_DistributionVariationCoefficientInvalid_LogsErrorAndReturnsFalse(
-            double coefficientOne, double coefficientTwo, double coefficientThree, double coefficientFour, string parameterName)
+            double coefficientOne, double coefficientTwo, double coefficientThree, string parameterName)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -429,7 +431,6 @@
             calculation.InputParameters.StormDuration.CoefficientOfVariation = (RoundedDouble) coefficientOne;
             calculation.InputParameters.StorageStructureArea.CoefficientOfVariation = (RoundedDouble) coefficientTwo;
             calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation = (RoundedDouble) coefficientThree;
-            calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation = (RoundedDouble) coefficientFour;
 
             // Call
             bool isValid = false;
@@ -773,7 +774,7 @@
                     input.FlowWidthAtBottomProtection.Mean, input.FlowWidthAtBottomProtection.StandardDeviation,
                     input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation,
                     input.FailureProbabilityStructureWithErosion,
-                    input.WidthFlowApertures.Mean, input.WidthFlowApertures.CoefficientOfVariation,
+                    input.WidthFlowApertures.Mean, input.WidthFlowApertures.StandardDeviation,
                     input.DeviationWaveDirection,
                     input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation);
 
@@ -1065,35 +1066,35 @@
         {
             get
             {
-                yield return new TestCaseData(double.NaN, 1, 2, 3, "modelfactor overloopdebiet volkomen overlaat");
-                yield return new TestCaseData(double.PositiveInfinity, 1, 2, 3, "modelfactor overloopdebiet volkomen overlaat");
+                yield return new TestCaseData(double.NaN, 1, 2, 3, 4, "modelfactor overloopdebiet volkomen overlaat");
+                yield return new TestCaseData(double.PositiveInfinity, 1, 2, 3, 4, "modelfactor overloopdebiet volkomen overlaat");
 
-                yield return new TestCaseData(1, double.NaN, 2, 3, "kerende hoogte");
-                yield return new TestCaseData(1, double.PositiveInfinity, 2, 3, "kerende hoogte");
+                yield return new TestCaseData(1, double.NaN, 2, 3, 4, "kerende hoogte");
+                yield return new TestCaseData(1, double.PositiveInfinity, 2, 3, 4, "kerende hoogte");
 
-                yield return new TestCaseData(1, 2, double.NaN, 3, "toegestane peilverhoging komberging");
-                yield return new TestCaseData(1, 2, double.PositiveInfinity, 3, "toegestane peilverhoging komberging");
+                yield return new TestCaseData(1, 2, double.NaN, 3, 4, "toegestane peilverhoging komberging");
+                yield return new TestCaseData(1, 2, double.PositiveInfinity, 3, 4, "toegestane peilverhoging komberging");
 
-                yield return new TestCaseData(1, 2, 3, double.NaN, "stroomvoerende breedte bodembescherming");
-                yield return new TestCaseData(1, 2, 3, double.PositiveInfinity, "stroomvoerende breedte bodembescherming");
+                yield return new TestCaseData(1, 2, 3, double.NaN, 4, "stroomvoerende breedte bodembescherming");
+                yield return new TestCaseData(1, 2, 3, double.PositiveInfinity, 4, "stroomvoerende breedte bodembescherming");
+
+                yield return new TestCaseData(1, 2, 3, 4, double.NaN, "breedte van doorstroomopening");
+                yield return new TestCaseData(1, 2, 3, 4, double.PositiveInfinity, "breedte van doorstroomopening");
             }
         }
 
         private static IEnumerable<TestCaseData> DistributionsWithInvalidCoefficient
         {
             get
             {
-                yield return new TestCaseData(double.NaN, 1, 2, 3, "stormduur");
-                yield return new TestCaseData(double.PositiveInfinity, 1, 2, 3, "stormduur");
+                yield return new TestCaseData(double.NaN, 1, 2, "stormduur");
+                yield return new TestCaseData(double.PositiveInfinity, 1, 2, "stormduur");
 
                 yield return new TestCaseData(1, double.NaN, 2, 3, "kombergend oppervlak");
-                yield return new TestCaseData(1, double.PositiveInfinity, 2, 3, "kombergend oppervlak");
+                yield return new TestCaseData(1, double.PositiveInfinity, 2, "kombergend oppervlak");
 
                 yield return new TestCaseData(1, 2, double.NaN, 3, "kritiek instromend debiet");
-                yield return new TestCaseData(1, 2, double.PositiveInfinity, 3, "kritiek instromend debiet");
-
-                yield return new TestCaseData(1, 2, 3, double.NaN, "breedte van doorstroomopening");
-                yield return new TestCaseData(1, 2, 3, double.PositiveInfinity, "breedte van doorstroomopening");
+                yield return new TestCaseData(1, 2, double.PositiveInfinity, "kritiek instromend debiet");
             }
         }