Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/EmptyGrassCoverErosionOutwardsOutputTreeNodeInfoTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/EmptyGrassCoverErosionOutwardsOutputTreeNodeInfoTest.cs	(.../EmptyGrassCoverErosionOutwardsOutputTreeNodeInfoTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/EmptyGrassCoverErosionOutwardsOutputTreeNodeInfoTest.cs	(.../EmptyGrassCoverErosionOutwardsOutputTreeNodeInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -119,7 +119,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -103,7 +103,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -rebde35e650a398aa9ce1b9c6950b91d2a47c007c -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision ebde35e650a398aa9ce1b9c6950b91d2a47c007c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -201,10 +201,6 @@
       <Project>{22E191F2-B2E3-413C-9511-4C2CDEDB2EFF}</Project>
       <Name>Ringtoets.ClosingStructures.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\ClosingStructures\test\Ringtoets.ClosingStructures.Data.TestUtil\Ringtoets.ClosingStructures.Data.TestUtil.csproj">
-      <Project>{F5B43C29-6169-4E9A-859E-09090330B94E}</Project>
-      <Name>Ringtoets.ClosingStructures.Data.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
@@ -261,10 +257,6 @@
       <Project>{F0BCF06A-3D01-4D65-A249-E2A14AEC6EFD}</Project>
       <Name>Ringtoets.HeightStructures.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HeightStructures\test\Ringtoets.HeightStructures.Data.TestUtil\Ringtoets.HeightStructures.Data.TestUtil.csproj">
-      <Project>{F67E8AE8-1FF0-4680-9817-99E025CD9FF6}</Project>
-      <Name>Ringtoets.HeightStructures.Data.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
@@ -317,10 +309,6 @@
       <Project>{D5F0A6B0-8710-4345-ABA1-D934C8E6783D}</Project>
       <Name>Ringtoets.StabilityPointStructures.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\StabilityPointStructures\test\Ringtoets.StabilityPointStructures.Data.TestUtil\Ringtoets.StabilityPointStructures.Data.TestUtil.csproj">
-      <Project>{E9AC095B-8F10-41D2-9456-4A85E3BA91AD}</Project>
-      <Name>Ringtoets.StabilityPointStructures.Data.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\StabilityStoneCover\src\Ringtoets.StabilityStoneCover.Data\Ringtoets.StabilityStoneCover.Data.csproj">
       <Project>{b479e3af-7c34-488c-bb73-d324100d36c9}</Project>
       <Name>Ringtoets.StabilityStoneCover.Data</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r475eb03892eeecc8b364e1484d7485036444ecb6 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs	(.../WaveConditionsInputContextTreeNodeInfoTest.cs)	(revision 475eb03892eeecc8b364e1484d7485036444ecb6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs	(.../WaveConditionsInputContextTreeNodeInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -102,7 +102,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -r702888aa87bd696750fcf3f5fcf50e2b8acb0390 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision 702888aa87bd696750fcf3f5fcf50e2b8acb0390)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -212,7 +212,7 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetfailureMechanismContextDatas),
+        [TestCaseSource(nameof(GetFailureMechanismContextDatas),
             new object[]
             {
                 "CloseForData_CorrespondingWithFailureMechanismContext_ReturnTrue({0})"
@@ -236,7 +236,7 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetfailureMechanismContextDatas),
+        [TestCaseSource(nameof(GetFailureMechanismContextDatas),
             new object[]
             {
                 "CloseForData_NotCorrespondingWithFailureMechanismContext_ReturnFalse({0})"
@@ -263,10 +263,10 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetfailureMechanismDatas),
+        [TestCaseSource(nameof(GetFailureMechanismDatas),
             new object[]
             {
-                "CloseForData_CorrespondingWithFailureMechanismContext_ReturnTrue({0})"
+                "CloseForData_CorrespondingWithFailureMechanism_ReturnTrue({0})"
             })]
         public void CloseForData_ViewCorrespondingWithRemovedFailureMechanism_ReturnsTrue(
             IFailureMechanism failureMechanism,
@@ -287,10 +287,10 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetfailureMechanismDatas),
+        [TestCaseSource(nameof(GetFailureMechanismDatas),
             new object[]
             {
-                "CloseForData_NotCorrespondingWithFailureMechanismContext_ReturnFalse({0})"
+                "CloseForData_NotCorrespondingWithFailureMechanism_ReturnFalse({0})"
             })]
         public void CloseForData_ViewNotCorrespondingWithRemovedFailureMechanism_ReturnsFalse(
             IFailureMechanism failureMechanism,
@@ -524,7 +524,7 @@
                                        nameof(WaveImpactAsphaltCoverWaveConditionsCalculation)));
         }
 
-        private static IEnumerable<TestCaseData> GetfailureMechanismDatas(string testNameFormat)
+        private static IEnumerable<TestCaseData> GetFailureMechanismDatas(string testNameFormat)
         {
             var grassCoverErosionOutwardsWaveConditionsCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
             yield return new TestCaseData(
@@ -548,7 +548,7 @@
                                        nameof(WaveImpactAsphaltCoverFailureMechanism)));
         }
 
-        private static IEnumerable<TestCaseData> GetfailureMechanismContextDatas(string testNameFormat)
+        private static IEnumerable<TestCaseData> GetFailureMechanismContextDatas(string testNameFormat)
         {
             var grassCoverErosionOutwardsWaveConditionsCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
             yield return new TestCaseData(
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r702888aa87bd696750fcf3f5fcf50e2b8acb0390 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 702888aa87bd696750fcf3f5fcf50e2b8acb0390)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -205,8 +205,7 @@
                 {
                     view.AssessmentSection = context.AssessmentSection;
                     view.PipingFailureMechanism = context.FailureMechanism;
-                },
-                CreateInstance = context => new PipingCalculationsView()
+                }
             };
 
             yield return new ViewInfo<PipingInputContext, PipingCalculationScenario, PipingInputView>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs
===================================================================
diff -u -rcbf0d02e860c096fd24d07fb4655e59206929827 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs	(.../PipingCalculationsViewInfoTest.cs)	(revision cbf0d02e860c096fd24d07fb4655e59206929827)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs	(.../PipingCalculationsViewInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Controls.Views;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -323,27 +322,5 @@
             // Assert
             mocks.VerifyAll();
         }
-
-        [Test]
-        public void CreateInstance_Always_NewViewWithHandler()
-        {
-            // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var failureMechanism = new PipingFailureMechanism();
-            var calculationGroup = new CalculationGroup();
-            var context = new PipingCalculationGroupContext(calculationGroup,
-                                                            Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                            Enumerable.Empty<StochasticSoilModel>(),
-                                                            failureMechanism,
-                                                            assessmentSection);
-
-            // Call
-            IView view = info.CreateInstance(context);
-
-            // Assert
-            Assert.IsInstanceOf<PipingCalculationsView>(view);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/EmptyStabilityStoneCoverOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/EmptyStabilityStoneCoverOutputTreeNodeInfoTest.cs	(.../EmptyStabilityStoneCoverOutputTreeNodeInfoTest.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/EmptyStabilityStoneCoverOutputTreeNodeInfoTest.cs	(.../EmptyStabilityStoneCoverOutputTreeNodeInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -119,7 +119,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsOutputTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsOutputTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -103,7 +103,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs	(.../EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs	(.../EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -119,7 +119,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -r4a9779426ab93aa90af783bf4d4f00aed2b32ce5
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 4a9779426ab93aa90af783bf4d4f00aed2b32ce5)
@@ -103,7 +103,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();