Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r3ebae7bb2d937dad17d83ff365bc896aefd8908d
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 4b889a77a0b2a44d9eadc54540334140415177c8)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 3ebae7bb2d937dad17d83ff365bc896aefd8908d)
@@ -1082,10 +1082,10 @@
                 {
                     // When
                     ToolStripItem validateMenuItem = contextMenu.Items[validateMenuItemIndex];
-                    Action call = () => validateMenuItem.PerformClick();
+                    void Call() => validateMenuItem.PerformClick();
 
                     // Then
-                    TestHelper.AssertLogMessages(call, logMessages =>
+                    TestHelper.AssertLogMessages(Call, logMessages =>
                     {
                         string[] messages = logMessages.ToArray();
                         int expectedMessageCount = validCalculation ? 2 : 3;
@@ -1327,10 +1327,10 @@
                 {
                     // When
                     ToolStripItem calculateMenuItem = contextMenu.Items[calculateMenuItemIndex];
-                    Action call = () => calculateMenuItem.PerformClick();
+                    void Call() => calculateMenuItem.PerformClick();
 
                     // Then
-                    TestHelper.AssertLogMessages(call, logMessages =>
+                    TestHelper.AssertLogMessages(Call, logMessages =>
                     {
                         string[] messages = logMessages.ToArray();
                         Assert.AreEqual(28, messages.Length);
@@ -1389,10 +1389,10 @@
                 {
                     // When
                     ToolStripItem validateMenuItem = contextMenu.Items[validateMenuItemIndex];
-                    Action call = () => validateMenuItem.PerformClick();
+                    void Call() => validateMenuItem.PerformClick();
 
                     // Then
-                    TestHelper.AssertLogMessages(call, logMessages =>
+                    TestHelper.AssertLogMessages(Call, logMessages =>
                     {
                         string[] messages = logMessages.ToArray();
                         Assert.AreEqual(2, messages.Length);
@@ -1451,10 +1451,10 @@
                 {
                     // When
                     ToolStripItem validateMenuItem = contextMenu.Items[validateMenuItemIndex];
-                    Action call = () => validateMenuItem.PerformClick();
+                    void Call() => validateMenuItem.PerformClick();
 
                     // Then
-                    TestHelper.AssertLogMessages(call, logMessages =>
+                    TestHelper.AssertLogMessages(Call, logMessages =>
                     {
                         string[] messages = logMessages.ToArray();
                         Assert.AreEqual(2, messages.Length);
@@ -1513,10 +1513,10 @@
                 {
                     // When
                     ToolStripItem validateMenuItem = contextMenu.Items[validateMenuItemIndex];
-                    Action call = () => validateMenuItem.PerformClick();
+                    void Call() => validateMenuItem.PerformClick();
 
                     // Then
-                    TestHelper.AssertLogMessages(call, logMessages =>
+                    TestHelper.AssertLogMessages(Call, logMessages =>
                     {
                         string[] messages = logMessages.ToArray();
                         Assert.AreEqual(2, messages.Length);
@@ -1576,10 +1576,10 @@
                 {
                     // When
                     ToolStripItem validateMenuItem = contextMenu.Items[validateMenuItemIndex];
-                    Action call = () => validateMenuItem.PerformClick();
+                    void Call() => validateMenuItem.PerformClick();
 
                     // Then
-                    TestHelper.AssertLogMessages(call, logMessages =>
+                    TestHelper.AssertLogMessages(Call, logMessages =>
                     {
                         string[] messages = logMessages.ToArray();
                         Assert.AreEqual(3, messages.Length);
@@ -1773,7 +1773,7 @@
             base.TearDown();
         }
 
-        private IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput()
+        private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput()
         {
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0);
 
@@ -1807,7 +1807,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = AssessmentSectionCategoryType.LowerLimitNorm,
+                    WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit,
                     ForeshoreProfile = new TestForeshoreProfile(true),
                     UseForeshore = true,
                     UseBreakWater = true,
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r3ebae7bb2d937dad17d83ff365bc896aefd8908d
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4b889a77a0b2a44d9eadc54540334140415177c8)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 3ebae7bb2d937dad17d83ff365bc896aefd8908d)
@@ -864,10 +864,10 @@
                 using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl))
                 {
                     // Call
-                    Action test = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
+                    void Call() => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
 
                     // Assert
-                    TestHelper.AssertLogMessages(test, m =>
+                    TestHelper.AssertLogMessages(Call, m =>
                     {
                         string[] messages = m.ToArray();
                         Assert.AreEqual(4, messages.Length);
@@ -918,10 +918,10 @@
                 using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl))
                 {
                     // Call
-                    Action test = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
+                    void Call() => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
 
                     // Assert
-                    TestHelper.AssertLogMessages(test, m =>
+                    TestHelper.AssertLogMessages(Call, m =>
                     {
                         string[] messages = m.ToArray();
                         Assert.AreEqual(2, messages.Length);
@@ -974,10 +974,10 @@
                 using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl))
                 {
                     // Call
-                    Action test = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
+                    void Call() => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
 
                     // Assert
-                    TestHelper.AssertLogMessages(test, m =>
+                    TestHelper.AssertLogMessages(Call, m =>
                     {
                         string[] messages = m.ToArray();
                         Assert.AreEqual(2, messages.Length);
@@ -1030,10 +1030,10 @@
                 using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl))
                 {
                     // Call
-                    Action test = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
+                    void Call() => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
 
                     // Assert
-                    TestHelper.AssertLogMessages(test, m =>
+                    TestHelper.AssertLogMessages(Call, m =>
                     {
                         string[] messages = m.ToArray();
                         Assert.AreEqual(2, messages.Length);
@@ -1101,10 +1101,10 @@
                 using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl))
                 {
                     // Call
-                    Action test = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
+                    void Call() => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick();
 
                     // Assert
-                    TestHelper.AssertLogMessages(test, m =>
+                    TestHelper.AssertLogMessages(Call, m =>
                     {
                         string[] messages = m.ToArray();
                         Assert.AreEqual(3, messages.Length);
@@ -1170,10 +1170,10 @@
                 using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl))
                 {
                     // Call
-                    Action test = () => contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick();
+                    void Call() => contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick();
 
                     // Assert
-                    TestHelper.AssertLogMessages(test, m =>
+                    TestHelper.AssertLogMessages(Call, m =>
                     {
                         string[] messages = m.ToArray();
                         Assert.AreEqual(56, messages.Length);
@@ -1913,7 +1913,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = AssessmentSectionCategoryType.LowerLimitNorm,
+                    WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit,
                     ForeshoreProfile = new TestForeshoreProfile(true),
                     UseForeshore = true,
                     UseBreakWater = true,