Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresCloneAssert.cs
===================================================================
diff -u -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c -ra289fc7fd021c71c56eec7adcc6ee5ed6097d8a9
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresCloneAssert.cs	(.../ClosingStructuresCloneAssert.cs)	(revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresCloneAssert.cs	(.../ClosingStructuresCloneAssert.cs)	(revision a289fc7fd021c71c56eec7adcc6ee5ed6097d8a9)
@@ -43,6 +43,7 @@
             CommonCloneAssert.AreClones(original, clone);
 
             CoreCloneAssert.AreObjectClones(original.ThresholdHeightOpenWeir, clone.ThresholdHeightOpenWeir, DistributionAssert.AreEqual);
+            CoreCloneAssert.AreObjectClones(original.ModelFactorSuperCriticalFlow, clone.ModelFactorSuperCriticalFlow, DistributionAssert.AreEqual);
             CoreCloneAssert.AreObjectClones(original.DrainCoefficient, clone.DrainCoefficient, DistributionAssert.AreEqual);
             CoreCloneAssert.AreObjectClones(original.AreaFlowApertures, clone.AreaFlowApertures, DistributionAssert.AreEqual);
             CoreCloneAssert.AreObjectClones(original.LevelCrestStructureNotClosing, clone.LevelCrestStructureNotClosing, DistributionAssert.AreEqual);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CommonCloneAssert.cs
===================================================================
diff -u -re1a93747d105f27392f4bc0655694810c7d29f4d -ra289fc7fd021c71c56eec7adcc6ee5ed6097d8a9
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CommonCloneAssert.cs	(.../CommonCloneAssert.cs)	(revision e1a93747d105f27392f4bc0655694810c7d29f4d)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/CommonCloneAssert.cs	(.../CommonCloneAssert.cs)	(revision a289fc7fd021c71c56eec7adcc6ee5ed6097d8a9)
@@ -259,7 +259,6 @@
         /// <paramref name="clone"/> are not clones.</exception>
         public static void AreClones<T>(StructuresInputBase<T> original, StructuresInputBase<T> clone) where T : StructureBase
         {
-            CoreCloneAssert.AreObjectClones(original.ModelFactorSuperCriticalFlow, clone.ModelFactorSuperCriticalFlow, DistributionAssert.AreEqual);
             CoreCloneAssert.AreObjectClones(original.AllowedLevelIncreaseStorage, clone.AllowedLevelIncreaseStorage, DistributionAssert.AreEqual);
             CoreCloneAssert.AreObjectClones(original.StorageStructureArea, clone.StorageStructureArea, DistributionAssert.AreEqual);
             CoreCloneAssert.AreObjectClones(original.FlowWidthAtBottomProtection, clone.FlowWidthAtBottomProtection, DistributionAssert.AreEqual);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -rf43bea6ea508df3cf621b39e9c163352d058c8ba -ra289fc7fd021c71c56eec7adcc6ee5ed6097d8a9
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision f43bea6ea508df3cf621b39e9c163352d058c8ba)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision a289fc7fd021c71c56eec7adcc6ee5ed6097d8a9)
@@ -265,6 +265,35 @@
             CoreCloneAssert.AreObjectClones(original, clone, HeightStructuresCloneAssert.AreClones);
         }
 
+        #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 Hydraulic data
 
         [Test]
@@ -310,35 +339,6 @@
 
         #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)
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructuresCloneAssert.cs
===================================================================
diff -u -r8036936a18ebe45fafa40d67a016424a32668391 -ra289fc7fd021c71c56eec7adcc6ee5ed6097d8a9
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructuresCloneAssert.cs	(.../HeightStructuresCloneAssert.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructuresCloneAssert.cs	(.../HeightStructuresCloneAssert.cs)	(revision a289fc7fd021c71c56eec7adcc6ee5ed6097d8a9)
@@ -42,8 +42,9 @@
         {
             CommonCloneAssert.AreClones(original, clone);
 
-            CoreCloneAssert.AreObjectClones(original.LevelCrestStructure, clone.LevelCrestStructure, DistributionAssert.AreEqual);
             Assert.AreEqual(original.DeviationWaveDirection, clone.DeviationWaveDirection);
+            CoreCloneAssert.AreObjectClones(original.ModelFactorSuperCriticalFlow, clone.ModelFactorSuperCriticalFlow, DistributionAssert.AreEqual);
+            CoreCloneAssert.AreObjectClones(original.LevelCrestStructure, clone.LevelCrestStructure, DistributionAssert.AreEqual);
         }
     }
 }
\ No newline at end of file