Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r1ce98a3d9324790760dfe128fb19aeccaf052a15
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs)	(revision 1ce98a3d9324790760dfe128fb19aeccaf052a15)
@@ -88,7 +88,7 @@
         [Test]
         [TestCase(NormType.LowerLimit, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm)]
         [TestCase(NormType.Signaling, FailureMechanismCategoryType.MechanismSpecificSignalingNorm)]
-        public void AddCalculationsFromLocations_MultipleLocationsEmptyCalculationBase_ReturnsUniquelyNamedCalculations(
+        public void AddCalculationsFromLocations_MultipleLocationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsAndCorrectInputSet(
             NormType normType,
             FailureMechanismCategoryType expectedFailureMechanismCategoryType)
         {
@@ -122,7 +122,7 @@
         [Test]
         [TestCase(NormType.LowerLimit, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm)]
         [TestCase(NormType.Signaling, FailureMechanismCategoryType.MechanismSpecificSignalingNorm)]
-        public void AddCalculationsFromLocations_MultipleLocationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculations(
+        public void AddCalculationsFromLocations_MultipleLocationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsAndCorrectInputSet(
             NormType normType,
             FailureMechanismCategoryType expectedFailureMechanismCategoryType)
         {
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r1ce98a3d9324790760dfe128fb19aeccaf052a15
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs)	(revision 1ce98a3d9324790760dfe128fb19aeccaf052a15)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.Contribution;
 using Riskeer.Common.Data.Hydraulics;
@@ -88,11 +87,11 @@
         }
 
         [Test]
-        [TestCase(NormType.LowerLimit, AssessmentSectionCategoryType.LowerLimitNorm)]
-        [TestCase(NormType.Signaling, AssessmentSectionCategoryType.SignalingNorm)]
-        public void AddCalculationsFromLocations_MultipleCalculationsEmptyCalculationBase_ReturnsUniquelyNamedCalculations(
+        [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)]
+        [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)]
+        public void AddCalculationsFromLocations_MultipleCalculationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsAndCorrectInputSet(
             NormType normType,
-            AssessmentSectionCategoryType expectedAssessmentSectionCategoryType)
+            WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType)
         {
             // Setup
             const string name = "name";
@@ -114,21 +113,21 @@
             Assert.AreEqual(name, firstCalculation.Name);
             AssessmentSectionCategoryWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters;
             Assert.AreEqual(locations[0], firstCalculationInput.HydraulicBoundaryLocation);
-            Assert.AreEqual(expectedAssessmentSectionCategoryType, firstCalculationInput.CategoryType);
+            Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, firstCalculationInput.WaterLevelType);
 
             var secondCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation) calculationBases.ElementAt(1);
             Assert.AreEqual($"{name} (1)", secondCalculation.Name);
             AssessmentSectionCategoryWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters;
             Assert.AreSame(locations[1], secondCalculationInput.HydraulicBoundaryLocation);
-            Assert.AreEqual(expectedAssessmentSectionCategoryType, secondCalculationInput.CategoryType);
+            Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, secondCalculationInput.WaterLevelType);
         }
 
         [Test]
-        [TestCase(NormType.LowerLimit, AssessmentSectionCategoryType.LowerLimitNorm)]
-        [TestCase(NormType.Signaling, AssessmentSectionCategoryType.SignalingNorm)]
-        public void AddCalculationsFromLocations_MultipleCalculationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculations(
+        [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)]
+        [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)]
+        public void AddCalculationsFromLocations_MultipleCalculationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsAndCorrectInputSet(
             NormType normType,
-            AssessmentSectionCategoryType expectedAssessmentSectionCategoryType)
+            WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType)
         {
             // Setup
             const string name = "name";
@@ -154,13 +153,13 @@
             Assert.AreEqual($"{name} (1)", firstCalculation.Name);
             AssessmentSectionCategoryWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters;
             Assert.AreEqual(locations[0], firstCalculationInput.HydraulicBoundaryLocation);
-            Assert.AreEqual(expectedAssessmentSectionCategoryType, firstCalculationInput.CategoryType);
+            Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, firstCalculationInput.WaterLevelType);
 
             var secondCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation) calculationBases.ElementAt(2);
             Assert.AreEqual($"{name} (2)", secondCalculation.Name);
             AssessmentSectionCategoryWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters;
             Assert.AreSame(locations[1], secondCalculationInput.HydraulicBoundaryLocation);
-            Assert.AreEqual(expectedAssessmentSectionCategoryType, secondCalculationInput.CategoryType);
+            Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, secondCalculationInput.WaterLevelType);
         }
     }
 }
\ No newline at end of file