Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r8963d5e5c4a22feba25c4e936e6b67de7104cccd -r04a0742040ae09f8839510470014d2b273e67a78
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresCalculationConfigurationReaderTest.cs	(.../HeightStructuresCalculationConfigurationReaderTest.cs)	(revision 8963d5e5c4a22feba25c4e936e6b67de7104cccd)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresCalculationConfigurationReaderTest.cs	(.../HeightStructuresCalculationConfigurationReaderTest.cs)	(revision 04a0742040ae09f8839510470014d2b273e67a78)
@@ -27,7 +27,6 @@
 using System.Linq;
 using System.Xml.Schema;
 using Core.Common.Base.IO;
-using Ringtoets.Common.IO;
 using Ringtoets.Common.IO.Configurations;
 
 namespace Ringtoets.HeightStructures.IO.Test
@@ -102,9 +101,9 @@
                 yield return new TestCaseData("invalidStochastMultipleStandardDeviation.xml",
                                               "Element 'standaardafwijking' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidStochastMultipleStandardDeviation");
-                yield return new TestCaseData("invalidStochastMultipleStandardDeviation.xml",
-                                              "Element 'standaardafwijking' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidStochastMultipleStandardDeviation");
+                yield return new TestCaseData("invalidStochastMultipleVariationCoefficient.xml",
+                                              "Element 'variatiecoefficient' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidStochastMultipleVariationCoefficient");
                 yield return new TestCaseData("invalidStochastMeanEmpty.xml",
                                               "The 'verwachtingswaarde' element is invalid - The value '' is invalid according to its datatype 'Double'")
                     .SetName("invalidStochastMeanEmpty");
@@ -298,11 +297,11 @@
             Assert.AreEqual(15.2, calculation.FlowWidthAtBottomProtection.Mean);
             Assert.AreEqual(0.1, calculation.FlowWidthAtBottomProtection.StandardDeviation);
             Assert.AreEqual(1.10, calculation.ModelFactorSuperCriticalFlow.Mean);
-            Assert.IsNull(calculation.ModelFactorSuperCriticalFlow.StandardDeviation);
+            Assert.AreEqual(0.12, calculation.ModelFactorSuperCriticalFlow.StandardDeviation);
             Assert.AreEqual(15000, calculation.StorageStructureArea.Mean);
             Assert.AreEqual(0.01, calculation.StorageStructureArea.VariationCoefficient);
             Assert.AreEqual(6.0, calculation.StormDuration.Mean);
-            Assert.IsNull(calculation.StormDuration.VariationCoefficient);
+            Assert.AreEqual(0.12, calculation.StormDuration.VariationCoefficient);
             Assert.AreEqual(15.2, calculation.WidthFlowApertures.Mean);
             Assert.AreEqual(0.1, calculation.WidthFlowApertures.StandardDeviation);
 
@@ -342,11 +341,11 @@
             Assert.IsTrue(double.IsNegativeInfinity(calculation.FlowWidthAtBottomProtection.Mean.Value));
             Assert.IsTrue(double.IsPositiveInfinity(calculation.FlowWidthAtBottomProtection.StandardDeviation.Value));
             Assert.IsTrue(double.IsNegativeInfinity(calculation.ModelFactorSuperCriticalFlow.Mean.Value));
-            Assert.IsNull(calculation.ModelFactorSuperCriticalFlow.StandardDeviation);
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.ModelFactorSuperCriticalFlow.StandardDeviation.Value));
             Assert.IsTrue(double.IsPositiveInfinity(calculation.StorageStructureArea.Mean.Value));
             Assert.IsTrue(double.IsPositiveInfinity(calculation.StorageStructureArea.VariationCoefficient.Value));
             Assert.IsTrue(double.IsNegativeInfinity(calculation.StormDuration.Mean.Value));
-            Assert.IsNull(calculation.StormDuration.VariationCoefficient);
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.StormDuration.VariationCoefficient.Value));
             Assert.IsTrue(double.IsPositiveInfinity(calculation.WidthFlowApertures.Mean.Value));
             Assert.IsTrue(double.IsPositiveInfinity(calculation.WidthFlowApertures.StandardDeviation.Value));
 
@@ -386,11 +385,11 @@
             Assert.IsNaN(calculation.FlowWidthAtBottomProtection.Mean);
             Assert.IsNaN(calculation.FlowWidthAtBottomProtection.StandardDeviation);
             Assert.IsNaN(calculation.ModelFactorSuperCriticalFlow.Mean);
-            Assert.IsNull(calculation.ModelFactorSuperCriticalFlow.StandardDeviation);
+            Assert.IsNaN(calculation.ModelFactorSuperCriticalFlow.StandardDeviation);
             Assert.IsNaN(calculation.StorageStructureArea.Mean);
             Assert.IsNaN(calculation.StorageStructureArea.VariationCoefficient);
             Assert.IsNaN(calculation.StormDuration.Mean);
-            Assert.IsNull(calculation.StormDuration.VariationCoefficient);
+            Assert.IsNaN(calculation.StormDuration.VariationCoefficient);
             Assert.IsNaN(calculation.WidthFlowApertures.Mean);
             Assert.IsNaN(calculation.WidthFlowApertures.StandardDeviation);