Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r4a35dfcba3abf411171c9d6ee9e822c0f1956b78 -r861bcd1d9466ea7a592bf5fbc75595728e9dcee1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 4a35dfcba3abf411171c9d6ee9e822c0f1956b78)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 861bcd1d9466ea7a592bf5fbc75595728e9dcee1)
@@ -130,8 +130,24 @@
             Assert.IsTrue(calculations.All(c => c.Output.CalculationConvergence == CalculationConvergence.CalculatedConverged));
         }
 
+        #region WaveConditions
+
+        private static void AssertFailureMechanismCategoryWaveConditionsInput(FailureMechanismCategoryWaveConditionsInput inputParameters)
+        {
+            Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id);
+            Assert.AreEqual(FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, inputParameters.CategoryType);
+        }
+
+        private static void AssertAssessmentSectionCategoryWaveConditionsInput(AssessmentSectionCategoryWaveConditionsInput inputParameters)
+        {
+            Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id);
+            Assert.AreEqual(AssessmentSectionCategoryType.LowerLimitNorm, inputParameters.CategoryType);
+        }
+
         #endregion
 
+        #endregion
+
         #region FailureMechanisms
 
         #region GrassCoverErosionInwardsFailureMechanism
@@ -171,7 +187,7 @@
                                                                                                   .WaveConditionsCalculationGroup.GetCalculations()
                                                                                                   .OfType<GrassCoverErosionOutwardsWaveConditionsCalculation>()
                                                                                                   .First();
-            AssertExpectedGrassCoverErosionOutwardsWaveConditionsInput(calculation.InputParameters);
+            AssertFailureMechanismCategoryWaveConditionsInput(calculation.InputParameters);
         }
 
         private static void AssertHydraulicBoundaryLocationCalculations(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IList<HydraulicBoundaryLocation> hydraulicBoundaryLocations)
@@ -228,12 +244,6 @@
             AssertHydraulicBoundaryCalculationResult(5.34, calculations, 17);
         }
 
-        private static void AssertExpectedGrassCoverErosionOutwardsWaveConditionsInput(FailureMechanismCategoryWaveConditionsInput inputParameters)
-        {
-            Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id);
-            Assert.AreEqual(FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, inputParameters.CategoryType);
-        }
-
         #endregion
 
         #region HeightStructuresFailureMechanism
@@ -554,15 +564,9 @@
                                                                                             .WaveConditionsCalculationGroup.GetCalculations()
                                                                                             .OfType<StabilityStoneCoverWaveConditionsCalculation>()
                                                                                             .First();
-            AssertExpectedStabilityStoneCoverWaveConditionsInput(calculation.InputParameters);
+            AssertAssessmentSectionCategoryWaveConditionsInput(calculation.InputParameters);
         }
 
-        private static void AssertExpectedStabilityStoneCoverWaveConditionsInput(AssessmentSectionCategoryWaveConditionsInput inputParameters)
-        {
-            Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id);
-            Assert.AreEqual(AssessmentSectionCategoryType.LowerLimitNorm, inputParameters.CategoryType);
-        }
-
         #endregion
 
         #region WaveImpactAsphaltCoverFailureMechanism
@@ -574,15 +578,9 @@
                                                                                                .WaveConditionsCalculationGroup.GetCalculations()
                                                                                                .OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>()
                                                                                                .First();
-            AssertExpectedWaveImpactAsphaltCoverWaveConditionsInput(calculation.InputParameters);
+            AssertAssessmentSectionCategoryWaveConditionsInput(calculation.InputParameters);
         }
 
-        private static void AssertExpectedWaveImpactAsphaltCoverWaveConditionsInput(AssessmentSectionCategoryWaveConditionsInput inputParameters)
-        {
-            Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id);
-            Assert.AreEqual(AssessmentSectionCategoryType.LowerLimitNorm, inputParameters.CategoryType);
-        }
-
         #endregion
 
         #endregion