Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -r2cac288356ca446c45385a83ebd1a032fb155283 -rf43bea6ea508df3cf621b39e9c163352d058c8ba
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision 2cac288356ca446c45385a83ebd1a032fb155283)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision f43bea6ea508df3cf621b39e9c163352d058c8ba)
@@ -125,6 +125,7 @@
             };
 
             RoundedDouble expectedFactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure;
+            NormalDistribution expectedModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow;
             NormalDistribution expectedDrainCoefficient = input.DrainCoefficient;
             RoundedDouble expectedDeviationWaveDirection = input.DeviationWaveDirection;
             double expectedFailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion;
@@ -145,6 +146,7 @@
             Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces);
             Assert.AreEqual(expectedDeviationWaveDirection, input.DeviationWaveDirection,
                             input.DeviationWaveDirection.GetAccuracy());
+            DistributionAssert.AreEqual(expectedModelFactorSuperCriticalFlow, input.ModelFactorSuperCriticalFlow);
             DistributionAssert.AreEqual(expectedDrainCoefficient, input.DrainCoefficient);
             Assert.AreEqual(expectedFailureProbabilityStructureWithErosion,
                             input.FailureProbabilityStructureWithErosion);
@@ -385,6 +387,31 @@
         #region Model factors
 
         [Test]
+        public void ModelFactorSuperCriticalFlow_Always_ExpectedValues()
+        {
+            // Setup
+            var random = new Random(22);
+            var input = new ClosingStructuresInput();
+            RoundedDouble mean = random.NextRoundedDouble(0.01, 1.0);
+            var expectedDistribution = new NormalDistribution(2)
+            {
+                Mean = mean,
+                StandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation
+            };
+            var distributionToSet = new NormalDistribution(5)
+            {
+                Mean = mean,
+                StandardDeviation = random.NextRoundedDouble()
+            };
+
+            // Call
+            input.ModelFactorSuperCriticalFlow = distributionToSet;
+
+            // Assert
+            DistributionTestHelper.AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution);
+        }
+
+        [Test]
         public void DrainCoefficient_Always_ExpectedValues()
         {
             // Setup
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs
===================================================================
diff -u -r2cac288356ca446c45385a83ebd1a032fb155283 -rf43bea6ea508df3cf621b39e9c163352d058c8ba
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs	(.../StructuresInputBaseTest.cs)	(revision 2cac288356ca446c45385a83ebd1a032fb155283)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs	(.../StructuresInputBaseTest.cs)	(revision f43bea6ea508df3cf621b39e9c163352d058c8ba)
@@ -160,7 +160,6 @@
             };
 
             VariationCoefficientLogNormalDistribution expectedStormDuration = input.StormDuration;
-            NormalDistribution expectedModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow;
             double expectedFailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion;
 
             // Precondition
@@ -171,7 +170,6 @@
 
             // Then
             DistributionAssert.AreEqual(expectedStormDuration, input.StormDuration);
-            DistributionAssert.AreEqual(expectedModelFactorSuperCriticalFlow, input.ModelFactorSuperCriticalFlow);
 
             AssertAreEqual(double.NaN, input.StructureNormalOrientation);
             Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces);
@@ -215,35 +213,6 @@
             Assert.AreEqual(expectedFailureProbabilityStructureWithErosion, input.FailureProbabilityStructureWithErosion);
         }
 
-        #region Model factors
-
-        [Test]
-        public void ModelFactorSuperCriticalFlow_Always_ExpectedValues()
-        {
-            // Setup
-            var random = new Random(22);
-            var input = new SimpleStructuresInput();
-            RoundedDouble mean = random.NextRoundedDouble(0.01, 1.0);
-            var expectedDistribution = new NormalDistribution(2)
-            {
-                Mean = mean,
-                StandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation
-            };
-            var distributionToSet = new NormalDistribution(5)
-            {
-                Mean = mean,
-                StandardDeviation = random.NextRoundedDouble()
-            };
-
-            // Call
-            input.ModelFactorSuperCriticalFlow = distributionToSet;
-
-            // Assert
-            DistributionTestHelper.AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution);
-        }
-
-        #endregion
-
         #region Hydraulic data
 
         [Test]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -r2cac288356ca446c45385a83ebd1a032fb155283 -rf43bea6ea508df3cf621b39e9c163352d058c8ba
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision 2cac288356ca446c45385a83ebd1a032fb155283)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision f43bea6ea508df3cf621b39e9c163352d058c8ba)
@@ -87,6 +87,7 @@
             };
 
             RoundedDouble expectedDeviationWaveDirection = input.DeviationWaveDirection;
+            NormalDistribution expectedModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow;
 
             // Precondition
             AssertHeightStructureInput(structure, input);
@@ -96,6 +97,7 @@
 
             // Then
             AssertAreEqual(expectedDeviationWaveDirection, input.DeviationWaveDirection);
+            DistributionAssert.AreEqual(expectedModelFactorSuperCriticalFlow, input.ModelFactorSuperCriticalFlow);
             Assert.AreEqual(1.0, input.FailureProbabilityStructureWithErosion);
 
             var expectedLevelCrestStructure = new NormalDistribution(2)
@@ -308,6 +310,35 @@
 
         #endregion
 
+        #region Model factors
+
+        [Test]
+        public void ModelFactorSuperCriticalFlow_Always_ExpectedValues()
+        {
+            // Setup
+            var random = new Random(22);
+            var input = new HeightStructuresInput();
+            RoundedDouble mean = random.NextRoundedDouble(0.01, 1.0);
+            var expectedDistribution = new NormalDistribution(2)
+            {
+                Mean = mean,
+                StandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation
+            };
+            var distributionToSet = new NormalDistribution(5)
+            {
+                Mean = mean,
+                StandardDeviation = random.NextRoundedDouble()
+            };
+
+            // Call
+            input.ModelFactorSuperCriticalFlow = distributionToSet;
+
+            // Assert
+            DistributionTestHelper.AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution);
+        }
+
+        #endregion
+
         #region Helpers
 
         private static void AssertHeightStructureInput(HeightStructure expectedHeightStructure, HeightStructuresInput input)