Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r2461955026e71ca100f17781eab6de0b1126d5ef
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 4b889a77a0b2a44d9eadc54540334140415177c8)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 2461955026e71ca100f17781eab6de0b1126d5ef)
@@ -1022,10 +1022,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;
@@ -1087,10 +1087,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);
@@ -1149,10 +1149,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);
@@ -1211,10 +1211,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);
@@ -1273,10 +1273,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);
@@ -1518,10 +1518,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(15, messages.Length);
@@ -1717,7 +1717,7 @@
             base.TearDown();
         }
 
-        private IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput()
+        private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput()
         {
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0);
 
@@ -1751,7 +1751,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = AssessmentSectionCategoryType.LowerLimitNorm,
+                    WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit,
                     ForeshoreProfile = new TestForeshoreProfile(true),
                     UseForeshore = true,
                     UseBreakWater = true,
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r2461955026e71ca100f17781eab6de0b1126d5ef
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4b889a77a0b2a44d9eadc54540334140415177c8)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2461955026e71ca100f17781eab6de0b1126d5ef)
@@ -878,10 +878,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);
@@ -932,10 +932,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);
@@ -988,10 +988,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);
@@ -1044,10 +1044,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);
@@ -1115,10 +1115,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);
@@ -1199,10 +1199,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(30, messages.Length);
@@ -1937,7 +1937,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = AssessmentSectionCategoryType.LowerLimitNorm,
+                    WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit,
                     ForeshoreProfile = new TestForeshoreProfile(true),
                     UseForeshore = true,
                     UseBreakWater = true,