Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs
===================================================================
diff -u -r396f21603d742cdfb0e92817e5fd0b4df1e9f851 -r8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs	(.../ClosingStructure.cs)	(revision 396f21603d742cdfb0e92817e5fd0b4df1e9f851)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs	(.../ClosingStructure.cs)	(revision 8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47)
@@ -40,8 +40,8 @@
         /// <param name="location">The location of the closing structure.</param>
         /// <param name="storageStructureAreaMean">The mean of the storage area of the closing structure.</param>
         /// <param name="storageStructureAreaCoefficientOfVariation">The coefficient of variation of the storage area of the closing structure.</param>
-        /// <param name="allowedLevelIncreaseStorageMean">The mean allowed increase of level for storage of the closing structure.</param>
-        /// <param name="allowedLevelIncreaseStorageStandardDeviation">The standard deviation of allowed increase of level for storage of the closing structure.</param>
+        /// <param name="allowedLevelIncreaseStorageMean">The mean of the allowed increase of level for storage of the closing structure.</param>
+        /// <param name="allowedLevelIncreaseStorageStandardDeviation">The standard deviation of the allowed increase of level for storage of the closing structure.</param>
         /// <param name="structureNormalOrientation">The orientation of the closing structure, relative to north.</param>
         /// <param name="widthFlowAperturesMean">The mean of the width of the flow apertures of the closing structure.</param>
         /// <param name="widthFlowAperturesCoefficientOfVariation">The coefficient of variation of the width of the flow apertures of the closing structure.</param>
@@ -65,7 +65,7 @@
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> or <paramref name="id"/> is <c>null</c>
         /// , empty or consists of whitespace.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="location"/> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when any parameter is out of range.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">When any stochastic variable parameter is out if its valid domain.</exception>
         public ClosingStructure(string name, string id, Point2D location,
                                 double storageStructureAreaMean, double storageStructureAreaCoefficientOfVariation,
                                 double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation,
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs
===================================================================
diff -u -r396f21603d742cdfb0e92817e5fd0b4df1e9f851 -r8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs	(.../ClosingStructureTest.cs)	(revision 396f21603d742cdfb0e92817e5fd0b4df1e9f851)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs	(.../ClosingStructureTest.cs)	(revision 8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Ringtoets.Common.Data;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 -r8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision a79ad28aed9a5de0a80df09d9b7e65d45070b940)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision 8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47)
@@ -83,10 +83,13 @@
             Assert.IsNaN(input.AllowedLevelIncreaseStorage.Mean);
             AssertEqualValue(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation);
             Assert.IsNaN(input.StorageStructureArea.Mean);
+            AssertEqualValue(0.1, input.StorageStructureArea.CoefficientOfVariation);
             Assert.IsNaN(input.FlowWidthAtBottomProtection.Mean);
             AssertEqualValue(0.05, input.FlowWidthAtBottomProtection.StandardDeviation);
             Assert.IsNaN(input.CriticalOvertoppingDischarge.Mean);
+            AssertEqualValue(0.15, input.CriticalOvertoppingDischarge.CoefficientOfVariation);
             Assert.IsNaN(input.WidthFlowApertures.Mean);
+            AssertEqualValue(0.05, input.WidthFlowApertures.CoefficientOfVariation);
             AssertEqualValue(6.0, input.StormDuration.Mean);
             AssertEqualValue(0.25, input.StormDuration.CoefficientOfVariation);
             Assert.AreEqual(1.0, input.ProbabilityOpenStructureBeforeFlooding);
@@ -474,7 +477,7 @@
         {
             // Setup
             var input = new ClosingStructuresInput();
-            VariationCoefficientLogNormalDistribution storageStructureArea = GenerateVariationVariationCoefficientLogNormalDistribution();
+            VariationCoefficientLogNormalDistribution storageStructureArea = GenerateVariationCoefficientLogNormalDistribution();
 
             //Call
             input.StorageStructureArea = storageStructureArea;
@@ -504,7 +507,7 @@
         {
             // Setup
             var input = new ClosingStructuresInput();
-            VariationCoefficientLogNormalDistribution criticalOvertoppingDischarge = GenerateVariationVariationCoefficientLogNormalDistribution();
+            VariationCoefficientLogNormalDistribution criticalOvertoppingDischarge = GenerateVariationCoefficientLogNormalDistribution();
 
             //Call
             input.CriticalOvertoppingDischarge = criticalOvertoppingDischarge;
@@ -583,16 +586,16 @@
         {
             // Setup
             var input = new ClosingStructuresInput();
-            VariationCoefficientLogNormalDistribution stormDuration = GenerateVariationVariationCoefficientLogNormalDistribution();
+            VariationCoefficientLogNormalDistribution stormDuration = GenerateVariationCoefficientLogNormalDistribution();
 
-            RoundedDouble initialStd = input.StormDuration.CoefficientOfVariation;
+            RoundedDouble initialVariation = input.StormDuration.CoefficientOfVariation;
 
             //Call
             input.StormDuration = stormDuration;
 
             //Assert
             Assert.AreEqual(stormDuration.Mean, input.StormDuration.Mean);
-            AssertEqualValue(initialStd, input.StormDuration.CoefficientOfVariation);
+            AssertEqualValue(initialVariation, input.StormDuration.CoefficientOfVariation);
         }
 
         [Test]
@@ -627,7 +630,7 @@
             Assert.AreEqual(probability, input.ProbabilityOpenStructureBeforeFlooding);
         }
 
-        private void AssertEqualValue(double expectedValue, RoundedDouble actualValue)
+        private static void AssertEqualValue(double expectedValue, RoundedDouble actualValue)
         {
             Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy());
         }
@@ -642,13 +645,13 @@
             };
         }
 
-        private static VariationCoefficientLogNormalDistribution GenerateVariationVariationCoefficientLogNormalDistribution()
+        private static VariationCoefficientLogNormalDistribution GenerateVariationCoefficientLogNormalDistribution()
         {
             var random = new Random(22);
             return new VariationCoefficientLogNormalDistribution(2)
             {
-                Mean = (RoundedDouble)(0.01 + random.NextDouble()),
-                CoefficientOfVariation = (RoundedDouble)random.NextDouble()
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
+                CoefficientOfVariation = (RoundedDouble) random.NextDouble()
             };
         }
 
@@ -667,8 +670,8 @@
             var random = new Random(22);
             return new VariationCoefficientNormalDistribution(2)
             {
-                Mean = (RoundedDouble)(0.01 + random.NextDouble()),
-                CoefficientOfVariation = (RoundedDouble)random.NextDouble()
+                Mean = (RoundedDouble) (0.01 + random.NextDouble()),
+                CoefficientOfVariation = (RoundedDouble) random.NextDouble()
             };
         }
     }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs
===================================================================
diff -u -rb70abd70f1cd326d1a753c5879a065149ac2ae84 -r8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs	(.../StabilityPointStructure.cs)	(revision b70abd70f1cd326d1a753c5879a065149ac2ae84)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs	(.../StabilityPointStructure.cs)	(revision 8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47)
@@ -41,8 +41,8 @@
         /// <param name="structureNormalOrientation">The orientation of the stability point structure, relative to north.</param>
         /// <param name="storageStructureAreaMean">The mean of the storage area of the stability point structure.</param>
         /// <param name="storageStructureAreaCoefficientOfVariation">The coefficient of variation of the storage area of the stability point structure.</param>
-        /// <param name="allowedLevelIncreaseStorageMean">The mean allowed increase of level for storage of the stability point structure.</param>
-        /// <param name="allowedLevelIncreaseStorageStandardDeviation">The standard deviation of allowed increase of level for storage of the stability point structure.</param>
+        /// <param name="allowedLevelIncreaseStorageMean">The mean of the allowed increase of level for storage of the stability point structure.</param>
+        /// <param name="allowedLevelIncreaseStorageStandardDeviation">The standard deviation of the allowed increase of level for storage of the stability point structure.</param>
         /// <param name="widthFlowAperturesMean">The mean of the width of the flow apertures of the stability point structure.</param>
         /// <param name="widthFlowAperturesCoefficientOfVariation">The coefficient of variation of the width of the flow apertures of the stability point structure.</param>
         /// <param name="insideWaterLevelMean">The mean interior water level of the stability point structure.</param>
@@ -86,6 +86,7 @@
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> or <paramref name="id"/> is <c>null</c>
         /// , empty or consists of whitespace.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="location"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">When any stochastic variable parameter is out if its valid domain.</exception>
         public StabilityPointStructure(string name, string id, Point2D location,
                                        double structureNormalOrientation,
                                        double storageStructureAreaMean, double storageStructureAreaCoefficientOfVariation,