Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationRowTest.cs
===================================================================
diff -u -r74a20d371886005785d916ef48037a1e2e5c3860 -r1f921ab814675ff7cfab82bdb1dc2a3cad4c97a9
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationRowTest.cs	(.../StabilityPointStructuresCalculationRowTest.cs)	(revision 74a20d371886005785d916ef48037a1e2e5c3860)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationRowTest.cs	(.../StabilityPointStructuresCalculationRowTest.cs)	(revision 1f921ab814675ff7cfab82bdb1dc2a3cad4c97a9)
@@ -314,30 +314,6 @@
         }
 
         [Test]
-        [TestCase(LoadSchematizationType.Linear, true)]
-        [TestCase(LoadSchematizationType.Quadratic, false)]
-        public void LoadSchematizationState_AlwaysOnChange_CorrectColumnStates(LoadSchematizationType loadSchematizationType, bool columnIsEnabled)
-        {
-            // Setup
-            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
-
-            // Call
-            var row = new StabilityPointStructuresCalculationRow(calculation, new ObservablePropertyChangeHandler(calculation, new StabilityPointStructuresInput()))
-            {
-                LoadSchematizationType = loadSchematizationType
-            };
-
-            // Assert
-            IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
-
-            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[constructiveStrengthLinearLoadModelColumnIndex], columnIsEnabled);
-            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[stabilityLinearLoadModelColumnIndex], columnIsEnabled);
-
-            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[constructiveStrengthQuadraticLoadModelColumnIndex], !columnIsEnabled);
-            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[stabilityQuadraticLoadModelColumnIndex], !columnIsEnabled);
-        }
-
-        [Test]
         public void ConstructiveStrengthLinearLoadModel_AlwaysOnChange_NotifyObserverAndCalculationPropertyChanged()
         {
             // Setup
@@ -664,6 +640,31 @@
         }
 
         [Test]
+        [TestCase(LoadSchematizationType.Linear)]
+        [TestCase(LoadSchematizationType.Quadratic)]
+        public void Constructor_LoadSchematizationType_CorrectColumnStates(LoadSchematizationType loadSchematizationType)
+        {
+            // Setup
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
+            {
+                InputParameters =
+                {
+                    LoadSchematizationType = loadSchematizationType
+                }
+            };
+
+            // Call
+            var row = new StabilityPointStructuresCalculationRow(calculation, new ObservablePropertyChangeHandler(calculation, new StabilityPointStructuresInput()));
+
+            // Assert
+            IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[constructiveStrengthLinearLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Linear);
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[stabilityLinearLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Linear);
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[constructiveStrengthQuadraticLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Quadratic);
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[stabilityQuadraticLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Quadratic);
+        }
+
+        [Test]
         [TestCase(true)]
         [TestCase(false)]
         public void UseBreakWater_AlwaysOnChange_CorrectColumnStates(bool useBreakWater)
@@ -758,6 +759,34 @@
             DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[useForeshoreColumnIndex], true);
         }
 
+        [Test]
+        [TestCase(LoadSchematizationType.Linear)]
+        [TestCase(LoadSchematizationType.Quadratic)]
+        public void LoadSchematizationType_AlwaysOnChange_CorrectColumnStates(LoadSchematizationType loadSchematizationType)
+        {
+            // Setup
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
+            {
+                InputParameters =
+                {
+                    LoadSchematizationType = 0
+                }
+            };
+
+            // Call
+            var row = new StabilityPointStructuresCalculationRow(calculation, new ObservablePropertyChangeHandler(calculation, new StabilityPointStructuresInput()))
+            {
+                LoadSchematizationType = loadSchematizationType
+            };
+
+            // Assert
+            IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[constructiveStrengthLinearLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Linear);
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[stabilityLinearLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Linear);
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[constructiveStrengthQuadraticLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Quadratic);
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[stabilityQuadraticLoadModelColumnIndex], loadSchematizationType == LoadSchematizationType.Quadratic);
+        }
+
         #endregion
     }
 }
\ No newline at end of file