Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContext.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.GrassCoverErosionOutwards.Data;
@@ -46,7 +45,7 @@
         /// the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public GrassCoverErosionOutwardsWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                                                   ICalculation calculation,
+                                                                   IWaveConditionsCalculation calculation,
                                                                    GrassCoverErosionOutwardsFailureMechanism failureMechanism)
             : base(wrappedData, calculation)
         {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -243,15 +243,6 @@
                                                                                  .AddPropertiesItem()
                                                                                  .Build()
             };
-
-            yield return new TreeNodeInfo<GrassCoverErosionOutwardsWaveConditionsInputContext>
-            {
-                Text = context => RingtoetsCommonFormsResources.Calculation_Input,
-                Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
-                                                                                 .AddPropertiesItem()
-                                                                                 .Build()
-            };
         }
 
         public override IEnumerable<ExportInfo> GetExportInfos()
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -27,7 +27,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.Revetment.Data;
-using TestCalculation = Ringtoets.Common.Forms.TestUtil.TestCalculation;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.PresentationObjects
 {
@@ -77,7 +77,7 @@
             // Call
             TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsInputContext(
                 null,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 failureMechanism);
 
             // Assert
@@ -112,7 +112,7 @@
             // Call
             TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsInputContext(
                 input,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 null);
 
             // Assert
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -25,12 +25,12 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PropertyClasses;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.PropertyClasses
 {
@@ -69,7 +69,7 @@
 
             var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(
                 new WaveConditionsInput(),
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 new GrassCoverErosionOutwardsFailureMechanism());
 
             // Call
@@ -87,7 +87,7 @@
             // Setup
             var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(
                 new WaveConditionsInput(),
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 new GrassCoverErosionOutwardsFailureMechanism());
 
             // Call
@@ -105,7 +105,7 @@
             // Setup
             var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(
                 new WaveConditionsInput(),
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 new GrassCoverErosionOutwardsFailureMechanism());
 
             // Call
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -96,7 +96,7 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(10, treeNodeInfos.Length);
+                Assert.AreEqual(9, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsFailureMechanismContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<GrassCoverErosionOutwardsFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HydraulicBoundariesGroupContext)));
@@ -106,7 +106,6 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyGrassCoverErosionOutwardsOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsOutput)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsInputContext)));
             }
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj
===================================================================
diff -u -r08b3bcba439831d547684b194ecdf903f2519700 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj)	(revision 08b3bcba439831d547684b194ecdf903f2519700)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -78,7 +78,6 @@
     <Compile Include="TreeNodeInfos\GrassCoverErosionOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs" />
-    <Compile Include="TreeNodeInfos\GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\HydraulicBoundariesGroupContextTreeNodeInfoTest.cs" />
Fisheye: Tag ec15ff35b39f333c422b8ca6988c34bd8573f134 refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -r08b3bcba439831d547684b194ecdf903f2519700 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 08b3bcba439831d547684b194ecdf903f2519700)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -133,6 +133,10 @@
       <Name>Ringtoets.DuneErosion.Plugin</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Forms\Ringtoets.Revetment.Forms.csproj">
+      <Project>{AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9}</Project>
+      <Name>Ringtoets.Revetment.Forms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\StabilityPointStructures\src\Ringtoets.StabilityPointStructures.Data\Ringtoets.StabilityPointStructures.Data.csproj">
       <Project>{3D4B9740-8348-4434-8D77-B611FC6EE57F}</Project>
       <Name>Ringtoets.StabilityPointStructures.Data</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -83,6 +83,7 @@
 using Ringtoets.Integration.Service.MessageProviders;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
+using Ringtoets.Revetment.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Data;
@@ -691,6 +692,15 @@
                               .Build();
                 }
             };
+
+            yield return new TreeNodeInfo<WaveConditionsInputContext>
+            {
+                Text = context => RingtoetsCommonFormsResources.Calculation_Input,
+                Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
+                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
+                                                                                 .AddPropertiesItem()
+                                                                                 .Build()
+            };
         }
 
         private static ViewInfo<FailureMechanismSectionResultContext<TResult>, IEnumerable<TResult>, TView> CreateFailureMechanismResultViewInfo<TResult, TView>()
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r08b3bcba439831d547684b194ecdf903f2519700 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 08b3bcba439831d547684b194ecdf903f2519700)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -112,6 +112,7 @@
     <Compile Include="TreeNodeInfos\TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\WaveHeightLocationsContextTreeNodeInfoTest.cs" />
+    <Compile Include="TreeNodeInfos\WaveConditionsInputContextTreeNodeInfoTest.cs" />
     <Compile Include="ViewInfos\CommentViewInfoTest.cs" />
     <Compile Include="ViewInfos\AssessmentSectionViewInfoTest.cs" />
     <Compile Include="ViewInfos\DesignWaterLevelLocationsViewInfoTest.cs" />
@@ -277,6 +278,14 @@
       <Project>{87c2c553-c0bc-40bf-b1ea-b83bff357f27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Forms\Ringtoets.Revetment.Forms.csproj">
+      <Project>{AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9}</Project>
+      <Name>Ringtoets.Revetment.Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\test\Ringtoets.Revetment.Data.TestUtil\Ringtoets.Revetment.Data.TestUtil.csproj">
+      <Project>{3706200E-48C6-4B86-B48C-4E45C69ABE95}</Project>
+      <Name>Ringtoets.Revetment.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\StabilityPointStructures\src\Ringtoets.StabilityPointStructures.Data\Ringtoets.StabilityPointStructures.Data.csproj">
       <Project>{3d4b9740-8348-4434-8d77-b611fc6ee57f}</Project>
       <Name>Ringtoets.StabilityPointStructures.Data</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -55,6 +55,7 @@
 using Ringtoets.Integration.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.Views;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
+using Ringtoets.Revetment.Forms.PresentationObjects;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test
@@ -402,7 +403,7 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(26, treeNodeInfos.Length);
+                Assert.AreEqual(27, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSection)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(BackgroundData)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ReferenceLineContext)));
@@ -429,6 +430,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityAssessmentOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyProbabilityAssessmentOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(RingtoetsProject)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveConditionsInputContext)));
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -0,0 +1,171 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using Core.Common.Controls.TreeView;
+using Core.Common.Gui;
+using Core.Common.Gui.ContextMenu;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.Properties;
+using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Forms.PresentationObjects;
+using Ringtoets.Revetment.TestUtil;
+
+namespace Ringtoets.Integration.Plugin.Test.TreeNodeInfos
+{
+    [TestFixture]
+    public class WaveConditionsInputContextTreeNodeInfoTest
+    {
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Setup
+            using (var plugin = new RingtoetsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
+
+                // Assert
+                Assert.IsNotNull(info.Text);
+                Assert.IsNull(info.ForeColor);
+                Assert.IsNotNull(info.Image);
+                Assert.IsNotNull(info.ContextMenuStrip);
+                Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.ExpandOnCreate);
+                Assert.IsNull(info.ChildNodeObjects);
+                Assert.IsNull(info.CanRename);
+                Assert.IsNull(info.OnNodeRenamed);
+                Assert.IsNull(info.CanRemove);
+                Assert.IsNull(info.OnNodeRemoved);
+                Assert.IsNull(info.CanCheck);
+                Assert.IsNull(info.IsChecked);
+                Assert.IsNull(info.OnNodeChecked);
+                Assert.IsNull(info.CanDrag);
+                Assert.IsNull(info.CanDrop);
+                Assert.IsNull(info.CanInsert);
+                Assert.IsNull(info.OnDrop);
+            }
+        }
+
+        [Test]
+        public void Text_Always_ReturnName()
+        {
+            // Setup
+            var context = new TestWaveConditionsInputContext(new WaveConditionsInput());
+
+            using (var plugin = new RingtoetsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
+
+                // Call
+                string nodeText = info.Text(context);
+
+                // Assert
+                Assert.AreEqual("Invoer", nodeText);
+            }
+        }
+
+        [Test]
+        public void Image_Always_ReturnOutputIcon()
+        {
+            // Setup
+            var context = new TestWaveConditionsInputContext(new WaveConditionsInput());
+            using (var plugin = new RingtoetsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
+                // Call
+                Image icon = info.Image(context);
+
+                // Assert
+                TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, icon);
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        {
+            // Setup
+            var mocks = new MockRepository();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var context = new TestWaveConditionsInputContext(new WaveConditionsInput());
+
+                var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
+                using (mocks.Ordered())
+                {
+                    menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.Build()).Return(null);
+                }
+
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                mocks.ReplayAll();
+
+                using (var plugin = new RingtoetsPlugin())
+                {
+                    TreeNodeInfo info = GetInfo(plugin);
+                    plugin.Gui = gui;
+
+                    // Call
+                    info.ContextMenuStrip(context, null, treeViewControl);
+                }
+            }
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        private static TreeNodeInfo GetInfo(RingtoetsPlugin plugin)
+        {
+            return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaveConditionsInputContext));
+        }
+
+        private class TestWaveConditionsInputContext : WaveConditionsInputContext
+        {
+            public TestWaveConditionsInputContext(WaveConditionsInput wrappedData) : base(wrappedData, new TestWaveConditionsCalculation()) { }
+
+            public override IEnumerable<HydraulicBoundaryLocation> HydraulicBoundaryLocations
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override IEnumerable<ForeshoreProfile> ForeshoreProfiles
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs	(.../WaveConditionsInputContext.cs)	(revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs	(.../WaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Controls.PresentationObjects;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Revetment.Data;
@@ -40,7 +39,7 @@
         /// <param name="wrappedData">The wrapped <see cref="WaveConditionsInput"/>.</param>
         /// <param name="calculation">The calculation having <paramref name="wrappedData"/> as input.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
-        protected WaveConditionsInputContext(WaveConditionsInput wrappedData, ICalculation calculation)
+        protected WaveConditionsInputContext(WaveConditionsInput wrappedData, IWaveConditionsCalculation calculation)
             : base(wrappedData)
         {
             if (calculation == null)
@@ -53,7 +52,7 @@
         /// <summary>
         /// Gets the calculation containing the wrapped <see cref="WaveConditionsInput"/>.
         /// </summary>
-        public ICalculation Calculation { get; private set; }
+        public IWaveConditionsCalculation Calculation { get; private set; }
 
         /// <summary>
         /// Gets the hydraulic boundary locations.
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj
===================================================================
diff -u -r62ed6462b31529a87c231f131195aef6efa6e3a7 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj	(.../Ringtoets.Revetment.Forms.csproj)	(revision 62ed6462b31529a87c231f131195aef6efa6e3a7)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj	(.../Ringtoets.Revetment.Forms.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -34,7 +34,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/Ringtoets.Revetment.Data.TestUtil.Test.csproj
===================================================================
diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/Ringtoets.Revetment.Data.TestUtil.Test.csproj	(.../Ringtoets.Revetment.Data.TestUtil.Test.csproj)	(revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/Ringtoets.Revetment.Data.TestUtil.Test.csproj	(.../Ringtoets.Revetment.Data.TestUtil.Test.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -50,6 +50,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestWaveConditionsCalculationTest.cs" />
     <Compile Include="TestWaveConditionsOutputTest.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsCalculationTest.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsCalculationTest.cs	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsCalculationTest.cs	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -0,0 +1,45 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.Revetment.TestUtil.Test
+{
+    [TestFixture]
+    public class TestWaveConditionsCalculationTest
+    {
+        [Test]
+        public void DefaultConstructor_PropertiesSet()
+        {
+            // Call
+            var calculation = new TestWaveConditionsCalculation();
+
+            // Assert
+            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<Observable>(calculation);
+            Assert.IsNull(calculation.Output);
+            Assert.IsFalse(calculation.HasOutput);
+            Assert.IsNull(calculation.InputParameters);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -46,6 +46,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestWaveConditionsCalculation.cs" />
     <Compile Include="TestWaveConditionsOutput.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -0,0 +1,61 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base;
+using Ringtoets.Common.Data;
+using Ringtoets.Revetment.Data;
+
+namespace Ringtoets.Revetment.TestUtil
+{
+    /// <summary>
+    /// Creates a simple <see cref="IWaveConditionsCalculation"/> implementation, which
+    /// can have an object set as output.
+    /// </summary>
+    public class TestWaveConditionsCalculation : Observable, IWaveConditionsCalculation
+    {
+        /// <summary>
+        /// Gets or sets an object that represents some output of this calculation.
+        /// </summary>
+        public object Output { get; set; }
+
+        public WaveConditionsInput InputParameters { get; }
+
+        public bool HasOutput
+        {
+            get
+            {
+                return Output != null;
+            }
+        }
+
+        public void ClearOutput()
+        {
+            Output = null;
+        }
+
+        #region Irrelevant for test
+
+        public string Name { get; set; }
+        public Comment Comments { get; }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -25,9 +25,9 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PresentationObjects;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.Revetment.Forms.Test.PresentationObjects
 {
@@ -62,7 +62,7 @@
 
         private class TestWaveConditionsInputContext : WaveConditionsInputContext
         {
-            public TestWaveConditionsInputContext(WaveConditionsInput wrappedData) : base(wrappedData, new TestCalculation()) {}
+            public TestWaveConditionsInputContext(WaveConditionsInput wrappedData) : base(wrappedData, new TestWaveConditionsCalculation()) {}
 
             public override IEnumerable<HydraulicBoundaryLocation> HydraulicBoundaryLocations
             {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -32,7 +32,6 @@
 using Core.Common.Utils;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -43,7 +42,7 @@
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PresentationObjects;
 using Ringtoets.Revetment.Forms.PropertyClasses;
-using TestCalculation = Ringtoets.Common.Forms.TestUtil.TestCalculation;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.Revetment.Forms.Test.PropertyClasses
 {
@@ -593,7 +592,7 @@
                 ForeshoreProfile = new TestForeshoreProfile(string.Empty)
             };
 
-            var calculation = new TestCalculation();
+            var calculation = new TestWaveConditionsCalculation();
             var inputContext = new TestWaveConditionsInputContext(input, calculation, new ForeshoreProfile[0], locations);
 
             var otherProfile = new TestForeshoreProfile(new Point2D(0, 190));
@@ -649,7 +648,7 @@
             observable.Expect(o => o.NotifyObservers());
             mocks.ReplayAll();
 
-            var calculation = new TestCalculation();
+            var calculation = new TestWaveConditionsCalculation();
             var input = new WaveConditionsInput();
             input.ForeshoreProfile = new TestForeshoreProfile();
 
@@ -678,10 +677,10 @@
             public TestWaveConditionsInputContext(WaveConditionsInput wrappedData,
                                                   IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                                   IEnumerable<HydraulicBoundaryLocation> locations)
-                : this(wrappedData, new TestCalculation(), foreshoreProfiles, locations) {}
+                : this(wrappedData, new TestWaveConditionsCalculation(), foreshoreProfiles, locations) {}
 
             public TestWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                                  ICalculation calculation,
+                                                  IWaveConditionsCalculation calculation,
                                                   IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                                   IEnumerable<HydraulicBoundaryLocation> locations)
                 : base(wrappedData, calculation)
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj
===================================================================
diff -u -r62ed6462b31529a87c231f131195aef6efa6e3a7 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj	(.../Ringtoets.Revetment.Forms.Test.csproj)	(revision 62ed6462b31529a87c231f131195aef6efa6e3a7)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj	(.../Ringtoets.Revetment.Forms.Test.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -125,6 +125,10 @@
       <Name>Ringtoets.Revetment.Forms</Name>
       <Private>True</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Revetment.Data.TestUtil\Ringtoets.Revetment.Data.TestUtil.csproj">
+      <Project>{3706200E-48C6-4B86-B48C-4E45C69ABE95}</Project>
+      <Name>Ringtoets.Revetment.Data.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs	(.../StabilityStoneCoverWaveConditionsInputContext.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs	(.../StabilityStoneCoverWaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Revetment.Data;
@@ -48,7 +47,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                                             ICalculation calculation,
+                                                             IWaveConditionsCalculation calculation,
                                                              IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                                              IAssessmentSection assessmentSection) : base(wrappedData, calculation)
         {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -143,15 +143,6 @@
                                                                                  .AddOpenItem()
                                                                                  .Build()
             };
-
-            yield return new TreeNodeInfo<StabilityStoneCoverWaveConditionsInputContext>
-            {
-                Text = context => RingtoetsCommonFormsResources.Calculation_Input,
-                Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
-                                                                                 .AddPropertiesItem()
-                                                                                 .Build()
-            };
         }
 
         public override IEnumerable<ImportInfo> GetImportInfos()
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextTest.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -28,9 +28,9 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PresentationObjects;
+using Ringtoets.Revetment.TestUtil;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
-using TestCalculation = Ringtoets.Common.Forms.TestUtil.TestCalculation;
 
 namespace Ringtoets.StabilityStoneCover.Forms.Test.PresentationObjects
 {
@@ -116,7 +116,7 @@
             // Call
             TestDelegate test = () => new StabilityStoneCoverWaveConditionsInputContext(
                 input,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 null,
                 assessmentSection);
 
@@ -162,7 +162,7 @@
 
             TestDelegate test = () => new StabilityStoneCoverWaveConditionsInputContext(
                 input,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 failureMechanism.ForeshoreProfiles,
                 null);
 
@@ -184,7 +184,7 @@
 
             var context = new StabilityStoneCoverWaveConditionsInputContext(
                 input,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 failureMechanism.ForeshoreProfiles,
                 assessmentSection);
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -26,9 +26,9 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PropertyClasses;
+using Ringtoets.Revetment.TestUtil;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
 
@@ -64,7 +64,7 @@
 
             var context = new StabilityStoneCoverWaveConditionsInputContext(
                 new WaveConditionsInput(),
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(), 
                 Enumerable.Empty<ForeshoreProfile>(),
                 assessmentSection);
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/Ringtoets.StabilityStoneCover.Plugin.Test.csproj
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/Ringtoets.StabilityStoneCover.Plugin.Test.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.Test.csproj)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/Ringtoets.StabilityStoneCover.Plugin.Test.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.Test.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -72,7 +72,6 @@
     <Compile Include="TreeNodeInfos\StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs" />
-    <Compile Include="TreeNodeInfos\StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\StabilityStoneCoverWaveConditionsOutputTreeNodeInfoTest.cs" />
     <Compile Include="ViewInfos\StabilityStoneCoverFailureMechanismViewInfoTest.cs" />
     <Compile Include="ViewInfos\StabilityStoneCoverResultViewInfoTest.cs" />
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -98,14 +98,13 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(7, treeNodeInfos.Length);
+                Assert.AreEqual(6, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverFailureMechanismContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyStabilityStoneCoverOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsOutput)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsInputContext)));
             }
         }
 
Fisheye: Tag ec15ff35b39f333c422b8ca6988c34bd8573f134 refers to a dead (removed) revision in file `Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Revetment.Data;
@@ -47,7 +46,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public WaveImpactAsphaltCoverWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                                                ICalculation calculation,
+                                                                IWaveConditionsCalculation calculation,
                                                                 IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                                                 IAssessmentSection assessmentSection)
             : base(wrappedData, calculation)
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -154,15 +154,6 @@
                                                                                  .AddPropertiesItem()
                                                                                  .Build()
             };
-
-            yield return new TreeNodeInfo<WaveImpactAsphaltCoverWaveConditionsInputContext>
-            {
-                Text = context => RingtoetsCommonFormsResources.Calculation_Input,
-                Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
-                                                                                 .AddPropertiesItem()
-                                                                                 .Build()
-            };
         }
 
         public override IEnumerable<ExportInfo> GetExportInfos()
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -28,9 +28,9 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PresentationObjects;
+using Ringtoets.Revetment.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
-using TestCalculation = Ringtoets.Common.Forms.TestUtil.TestCalculation;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Forms.Test.PresentationObjects
 {
@@ -93,7 +93,7 @@
             // Call
             TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsInputContext(
                 null,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 failureMechanism.ForeshoreProfiles,
                 assessmentSection);
 
@@ -138,7 +138,7 @@
             // Call
             TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsInputContext(
                 input,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 null,
                 assessmentSection);
 
@@ -158,7 +158,7 @@
             // Call
             TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsInputContext(
                 input,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 failureMechanism.ForeshoreProfiles,
                 null);
 
@@ -180,7 +180,7 @@
 
             var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(
                 input,
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 failureMechanism.ForeshoreProfiles,
                 assessmentSection);
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -26,9 +26,9 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.PropertyClasses;
+using Ringtoets.Revetment.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses;
 
@@ -64,7 +64,7 @@
 
             var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(
                 new WaveConditionsInput(),
-                new TestCalculation(),
+                new TestWaveConditionsCalculation(),
                 Enumerable.Empty<ForeshoreProfile>(),
                 assessmentSection);
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj
===================================================================
diff -u -ra70cb733eb761229173777b9f6cd1b977830b24b -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision a70cb733eb761229173777b9f6cd1b977830b24b)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -70,7 +70,6 @@
     <Compile Include="TreeNodeInfos\WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs" />
-    <Compile Include="TreeNodeInfos\WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs" />
     <Compile Include="ViewInfos\WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs" />
     <Compile Include="ViewInfos\WaveImpactAsphaltCoverResultViewInfoTest.cs" />
Fisheye: Tag ec15ff35b39f333c422b8ca6988c34bd8573f134 refers to a dead (removed) revision in file `Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -rec15ff35b39f333c422b8ca6988c34bd8573f134
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
@@ -111,14 +111,13 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(7, treeNodeInfos.Length);
+                Assert.AreEqual(6, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverFailureMechanismContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<WaveImpactAsphaltCoverFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyWaveImpactAsphaltCoverOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsOutput)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsInputContext)));
             }
         }