Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2e3c50c06378328b265871e73a111c914002dd38 -r97926dd17e9accda5293e20499c3454cfc909840
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2e3c50c06378328b265871e73a111c914002dd38)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 97926dd17e9accda5293e20499c3454cfc909840)
@@ -1776,13 +1776,13 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var existingGroup = new CalculationGroup();
-                var existingcalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
+                var existingCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
                 var group = new CalculationGroup
                 {
                     Children =
                     {
                         existingGroup,
-                        existingcalculation
+                        existingCalculation
                     }
                 };
                 var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation();
@@ -1840,7 +1840,7 @@
                 // Then
                 Assert.AreEqual(4, group.Children.Count);
                 Assert.AreSame(existingGroup, group.Children[0]);
-                Assert.AreSame(existingcalculation, group.Children[1]);
+                Assert.AreSame(existingCalculation, group.Children[1]);
                 Assert.NotNull(dialog);
                 Assert.NotNull(grid);
 
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3ebae7bb2d937dad17d83ff365bc896aefd8908d -r97926dd17e9accda5293e20499c3454cfc909840
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 3ebae7bb2d937dad17d83ff365bc896aefd8908d)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 97926dd17e9accda5293e20499c3454cfc909840)
@@ -1489,13 +1489,13 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var existingGroup = new CalculationGroup();
-                var existingcalculation = new StabilityStoneCoverWaveConditionsCalculation();
+                var existingCalculation = new StabilityStoneCoverWaveConditionsCalculation();
                 var group = new CalculationGroup
                 {
                     Children =
                     {
                         existingGroup,
-                        existingcalculation
+                        existingCalculation
                     }
                 };
 
@@ -1553,7 +1553,7 @@
                 // Then
                 Assert.AreEqual(4, group.Children.Count);
                 Assert.AreSame(existingGroup, group.Children[0]);
-                Assert.AreSame(existingcalculation, group.Children[1]);
+                Assert.AreSame(existingCalculation, group.Children[1]);
                 Assert.NotNull(dialog);
                 Assert.NotNull(grid);
 
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2461955026e71ca100f17781eab6de0b1126d5ef -r97926dd17e9accda5293e20499c3454cfc909840
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 2461955026e71ca100f17781eab6de0b1126d5ef)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 97926dd17e9accda5293e20499c3454cfc909840)
@@ -1494,8 +1494,7 @@
                 gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder);
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
 
-                RoundedDouble assessmentLevel = assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
-                                                                                     calculation.InputParameters.CategoryType);
+                RoundedDouble assessmentLevel = WaveConditionsInputHelper.GetAssessmentLevel(calculation.InputParameters, assessmentSection);
                 IEnumerable<RoundedDouble> waterLevels = calculation.InputParameters.GetWaterLevels(assessmentLevel);
                 int nrOfCalculators = waterLevels.Count();
                 var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2461955026e71ca100f17781eab6de0b1126d5ef -r97926dd17e9accda5293e20499c3454cfc909840
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2461955026e71ca100f17781eab6de0b1126d5ef)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 97926dd17e9accda5293e20499c3454cfc909840)
@@ -1180,8 +1180,7 @@
 
                 int nrOfCalculators = failureMechanism.Calculations
                                                       .Cast<WaveImpactAsphaltCoverWaveConditionsCalculation>()
-                                                      .Sum(c => c.InputParameters.GetWaterLevels(assessmentSection.GetAssessmentLevel(c.InputParameters.HydraulicBoundaryLocation,
-                                                                                                                                      c.InputParameters.CategoryType)).Count());
+                                                      .Sum(c => c.InputParameters.GetWaterLevels(WaveConditionsInputHelper.GetAssessmentLevel(c.InputParameters, assessmentSection)).Count());
                 var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();
                 calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
@@ -1516,13 +1515,13 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var existingGroup = new CalculationGroup();
-                var existingcalculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
+                var existingCalculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
                 var group = new CalculationGroup
                 {
                     Children =
                     {
                         existingGroup,
-                        existingcalculation
+                        existingCalculation
                     }
                 };
                 var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
@@ -1578,7 +1577,7 @@
                 // Then
                 Assert.AreEqual(4, group.Children.Count);
                 Assert.AreSame(existingGroup, group.Children[0]);
-                Assert.AreSame(existingcalculation, group.Children[1]);
+                Assert.AreSame(existingCalculation, group.Children[1]);
                 Assert.NotNull(dialog);
                 Assert.NotNull(grid);