Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs
===================================================================
diff -u -rc57c24dac3c7897cbfc6532ba05add215fbe00a3 -rb2b822ebf92f60fa73d2a92c951b31f4f4ffa03c
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision c57c24dac3c7897cbfc6532ba05add215fbe00a3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision b2b822ebf92f60fa73d2a92c951b31f4f4ffa03c)
@@ -177,7 +177,6 @@
 
             const string schematizationCategory = "Schematisatie";
             const string hydraulicDataCategory = "Hydraulische gegevens";
-            const string modelSettingsCategory = "Modelinstellingen";
             const string outputSettingsCategory = "Uitvoer";
 
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -237,12 +236,6 @@
             Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", failureProbabilityStructureWithErosionProperty.DisplayName);
             Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem.", failureProbabilityStructureWithErosionProperty.Description);
 
-            PropertyDescriptor modelFactorSuperCriticalFlowProperty = dynamicProperties[constructionProperties.ModelFactorSuperCriticalFlowPropertyIndex];
-            Assert.IsInstanceOf<ExpandableObjectConverter>(modelFactorSuperCriticalFlowProperty.Converter);
-            Assert.AreEqual(modelSettingsCategory, modelFactorSuperCriticalFlowProperty.Category);
-            Assert.AreEqual("Modelfactor overloopdebiet volkomen overlaat [-]", modelFactorSuperCriticalFlowProperty.DisplayName);
-            Assert.AreEqual("Modelfactor voor het overloopdebiet over een volkomen overlaat.", modelFactorSuperCriticalFlowProperty.Description);
-
             PropertyDescriptor foreshoreProfileProperty = dynamicProperties[constructionProperties.ForeshoreProfilePropertyIndex];
             Assert.IsFalse(foreshoreProfileProperty.IsReadOnly);
             Assert.AreEqual(schematizationCategory, foreshoreProfileProperty.Category);
@@ -952,7 +945,6 @@
             var foreshoreProfileObject = new object();
             var useBreakWaterObject = new object();
             var useForeshoreObject = new object();
-            var modelFactorSuperCriticalFlowObject = new object();
             var hydraulicBoundaryLocationObject = new object();
             var stormDurationObject = new object();
 
@@ -971,7 +963,6 @@
                     foreshoreProfileObject,
                     useBreakWaterObject,
                     useForeshoreObject,
-                    modelFactorSuperCriticalFlowObject,
                     hydraulicBoundaryLocationObject,
                     stormDurationObject
                 }.OrderBy(p => random.Next())
@@ -996,7 +987,6 @@
                 ForeshoreProfilePropertyIndex = randomObjectLookup.IndexOf(foreshoreProfileObject),
                 UseBreakWaterPropertyIndex = randomObjectLookup.IndexOf(useBreakWaterObject),
                 UseForeshorePropertyIndex = randomObjectLookup.IndexOf(useForeshoreObject),
-                ModelFactorSuperCriticalFlowPropertyIndex = randomObjectLookup.IndexOf(modelFactorSuperCriticalFlowObject),
                 HydraulicBoundaryLocationPropertyIndex = randomObjectLookup.IndexOf(hydraulicBoundaryLocationObject),
                 StormDurationPropertyIndex = randomObjectLookup.IndexOf(stormDurationObject)
             };
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -rc57c24dac3c7897cbfc6532ba05add215fbe00a3 -rb2b822ebf92f60fa73d2a92c951b31f4f4ffa03c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision c57c24dac3c7897cbfc6532ba05add215fbe00a3)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision b2b822ebf92f60fa73d2a92c951b31f4f4ffa03c)
@@ -76,7 +76,7 @@
         }
 
         [Test]
-        public void Constructor_WithoutData_ExpectedValues()
+        public void Constructor_WithoutData_ThrowsArgumentNullException()
         {
             // Setup
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
@@ -91,7 +91,7 @@
         }
 
         [Test]
-        public void Constructor_WithoutHandler_ExpectedValues()
+        public void Constructor_WithoutHandler_ThrowsArgumentNullException()
         {
             // Setup
             mockRepository.ReplayAll();
@@ -113,7 +113,7 @@
         }
 
         [Test]
-        public void Constructor_ValidData_ExpectedValues()
+        public void Constructor_WithData_ExpectedValues()
         {
             // Setup
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r4a568c24a6db2807c63646526c8cb5fa74b52ed2 -rb2b822ebf92f60fa73d2a92c951b31f4f4ffa03c
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision 4a568c24a6db2807c63646526c8cb5fa74b52ed2)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs	(.../StabilityPointStructuresInputContextPropertiesTest.cs)	(revision b2b822ebf92f60fa73d2a92c951b31f4f4ffa03c)
@@ -115,7 +115,7 @@
                                                                         failureMechanism,
                                                                         assessmentSection);
 
-            // Call            
+            // Call
             var properties = new StabilityPointStructuresInputContextProperties(inputContext, handler);
 
             // Assert
@@ -124,7 +124,6 @@
 
             StabilityPointStructuresInput input = calculation.InputParameters;
 
-            Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data);
             Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation);
             Assert.AreEqual(input.VolumicWeightWater, properties.VolumicWeightWater);
             Assert.AreSame(input.InsideWaterLevelFailureConstruction, properties.InsideWaterLevelFailureConstruction.Data);