Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs
===================================================================
diff -u -r92372ba046f1df1593268f692339a53dc1b94e12 -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs	(.../GeneralClosingStructuresInputTest.cs)	(revision 92372ba046f1df1593268f692339a53dc1b94e12)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs	(.../GeneralClosingStructuresInputTest.cs)	(revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3)
@@ -32,6 +32,25 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
+            // Setup
+            var modelFactorOverToppingFlow = new LogNormalDistribution(3)
+            {
+                Mean = (RoundedDouble) 0.09,
+                StandardDeviation = (RoundedDouble) 0.06
+            };
+
+            var modelFactorSubCriticalFlow = new VariationCoefficientNormalDistribution(2)
+            {
+                Mean = (RoundedDouble) 1,
+                CoefficientOfVariation = (RoundedDouble) 0.1
+            };
+
+            var modelFactorStorageVolume = new LogNormalDistribution(2)
+            {
+                Mean = (RoundedDouble) 1.0,
+                StandardDeviation = (RoundedDouble) 0.2
+            };
+
             // Call
             var inputParameters = new GeneralClosingStructuresInput();
 
@@ -47,18 +66,10 @@
             Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces);
             AssertEqualValue(9.81, inputParameters.GravitationalAcceleration);
 
-            Assert.IsInstanceOf<LogNormalDistribution>(inputParameters.ModelFactorOvertoppingFlow);
-            AssertEqualValue(0.09, inputParameters.ModelFactorOvertoppingFlow.Mean);
-            AssertEqualValue(0.06, inputParameters.ModelFactorOvertoppingFlow.StandardDeviation);
-            
-            Assert.IsInstanceOf<VariationCoefficientNormalDistribution>(inputParameters.ModelFactorSubCriticalFlow);
-            AssertEqualValue(1, inputParameters.ModelFactorSubCriticalFlow.Mean);
-            AssertEqualValue(0.1, inputParameters.ModelFactorSubCriticalFlow.CoefficientOfVariation);
+            DistributionAssert.AreEqual(modelFactorOverToppingFlow, inputParameters.ModelFactorOvertoppingFlow);
+            DistributionAssert.AreEqual(modelFactorSubCriticalFlow, inputParameters.ModelFactorSubCriticalFlow);
+            DistributionAssert.AreEqual(modelFactorStorageVolume, inputParameters.ModelFactorStorageVolume);
 
-            Assert.IsInstanceOf<LogNormalDistribution>(inputParameters.ModelFactorStorageVolume);
-            AssertEqualValue(1.0, inputParameters.ModelFactorStorageVolume.Mean);
-            AssertEqualValue(0.2, inputParameters.ModelFactorStorageVolume.StandardDeviation);
-
             Assert.AreEqual(2, inputParameters.ModelFactorInflowVolume.NumberOfDecimalPlaces);
             AssertEqualValue(1.0, inputParameters.ModelFactorInflowVolume);
         }