Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rde3f91fbadb5d63b1c0128aa37fc5a092c19322c -ra37ea507632afd8fefc92fec5e3246dcbc86b4b0
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision de3f91fbadb5d63b1c0128aa37fc5a092c19322c)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision a37ea507632afd8fefc92fec5e3246dcbc86b4b0)
@@ -32,11 +32,8 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Forms.PresentationObjects;
-using Riskeer.Common.Plugin.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Riskeer.GrassCoverErosionOutwards.Forms.Views;
@@ -48,7 +45,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.ViewInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest : ShouldCloseViewWithCalculationDataTester
+    public class GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest
     {
         private const int lowerBoundaryRevetmentChartDataIndex = 1;
         private const int upperBoundaryRevetmentChartDataIndex = 2;
@@ -157,68 +154,8 @@
             }
         }
 
-        #region ShouldCloseViewWithCalculationDataTester
+        #region CloseForData
 
-        protected override bool ShouldCloseMethod(IView view, object o)
-        {
-            return info.CloseForData(view, o);
-        }
-
-        protected override IView GetView(ICalculation data)
-        {
-            return new WaveConditionsInputView((ICalculation<WaveConditionsInput>) data,
-                                               () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
-                                               new GrassCoverErosionOutwardsWaveConditionsInputViewStyle());
-        }
-
-        protected override ICalculation GetCalculation()
-        {
-            return new GrassCoverErosionOutwardsWaveConditionsCalculation();
-        }
-
-        protected override ICalculationContext<ICalculation, IFailureMechanism> GetCalculationContextWithCalculation()
-        {
-            return new GrassCoverErosionOutwardsWaveConditionsCalculationContext(
-                new GrassCoverErosionOutwardsWaveConditionsCalculation(),
-                new CalculationGroup(),
-                new GrassCoverErosionOutwardsFailureMechanism(),
-                new AssessmentSectionStub());
-        }
-
-        protected override ICalculationContext<CalculationGroup, IFailureMechanism> GetCalculationGroupContextWithCalculation()
-        {
-            return new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(
-                new CalculationGroup
-                {
-                    Children =
-                    {
-                        new GrassCoverErosionOutwardsWaveConditionsCalculation()
-                    }
-                },
-                null,
-                new GrassCoverErosionOutwardsFailureMechanism(),
-                new AssessmentSectionStub());
-        }
-
-        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
-        {
-            return new GrassCoverErosionOutwardsHydraulicLoadsContext(
-                new GrassCoverErosionOutwardsFailureMechanism
-                {
-                    WaveConditionsCalculationGroup =
-                    {
-                        Children =
-                        {
-                            new GrassCoverErosionOutwardsWaveConditionsCalculation()
-                        }
-                    }
-                }, new AssessmentSectionStub());
-        }
-
-        #endregion
-
-                #region CloseForData
-
         [Test]
         public void CloseForData_ViewCorrespondingToRemovedCalculationContext_ReturnsTrue()
         {
@@ -618,6 +555,13 @@
                 mocks.VerifyAll();
             }
         }
+        
+        private static IView GetView(ICalculation data)
+        {
+            return new WaveConditionsInputView((ICalculation<WaveConditionsInput>) data,
+                                               () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
+                                               new GrassCoverErosionOutwardsWaveConditionsInputViewStyle());
+        }
 
         #endregion
         
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rde3f91fbadb5d63b1c0128aa37fc5a092c19322c -ra37ea507632afd8fefc92fec5e3246dcbc86b4b0
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs	(.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs)	(revision de3f91fbadb5d63b1c0128aa37fc5a092c19322c)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs	(.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs)	(revision a37ea507632afd8fefc92fec5e3246dcbc86b4b0)
@@ -32,11 +32,8 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Forms.PresentationObjects;
-using Riskeer.Common.Plugin.TestUtil;
 using Riskeer.Revetment.Data;
 using Riskeer.Revetment.Data.TestUtil;
 using Riskeer.Revetment.Forms.Views;
@@ -48,7 +45,7 @@
 namespace Riskeer.StabilityStoneCover.Plugin.Test.ViewInfos
 {
     [TestFixture]
-    public class StabilityStoneCoverWaveConditionsInputViewInfoTest : ShouldCloseViewWithCalculationDataTester
+    public class StabilityStoneCoverWaveConditionsInputViewInfoTest
     {
         private const int lowerBoundaryRevetmentChartDataIndex = 1;
         private const int upperBoundaryRevetmentChartDataIndex = 2;
@@ -157,66 +154,6 @@
             }
         }
 
-        #region ShouldCloseViewWithCalculationDataTester
-
-        protected override bool ShouldCloseMethod(IView view, object o)
-        {
-            return info.CloseForData(view, o);
-        }
-
-        protected override IView GetView(ICalculation data)
-        {
-            return new WaveConditionsInputView((ICalculation<WaveConditionsInput>) data,
-                                               () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
-                                               new StabilityStoneCoverWaveConditionsInputViewStyle());
-        }
-
-        protected override ICalculation GetCalculation()
-        {
-            return new StabilityStoneCoverWaveConditionsCalculation();
-        }
-
-        protected override ICalculationContext<ICalculation, IFailureMechanism> GetCalculationContextWithCalculation()
-        {
-            return new StabilityStoneCoverWaveConditionsCalculationContext(
-                new StabilityStoneCoverWaveConditionsCalculation(),
-                new CalculationGroup(),
-                new StabilityStoneCoverFailureMechanism(),
-                new AssessmentSectionStub());
-        }
-
-        protected override ICalculationContext<CalculationGroup, IFailureMechanism> GetCalculationGroupContextWithCalculation()
-        {
-            return new StabilityStoneCoverWaveConditionsCalculationGroupContext(
-                new CalculationGroup
-                {
-                    Children =
-                    {
-                        new StabilityStoneCoverWaveConditionsCalculation()
-                    }
-                },
-                null,
-                new StabilityStoneCoverFailureMechanism(),
-                new AssessmentSectionStub());
-        }
-
-        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
-        {
-            return new StabilityStoneCoverHydraulicLoadsContext(
-                new StabilityStoneCoverFailureMechanism
-                {
-                    WaveConditionsCalculationGroup =
-                    {
-                        Children =
-                        {
-                            new StabilityStoneCoverWaveConditionsCalculation()
-                        }
-                    }
-                }, new AssessmentSectionStub());
-        }
-
-        #endregion
-
         #region CloseForData
 
         [Test]
@@ -619,6 +556,13 @@
             }
         }
 
+        private static IView GetView(ICalculation data)
+        {
+            return new WaveConditionsInputView((ICalculation<WaveConditionsInput>) data,
+                                               () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
+                                               new StabilityStoneCoverWaveConditionsInputViewStyle());
+        }
+        
         #endregion
     }
 }
\ No newline at end of file
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rde3f91fbadb5d63b1c0128aa37fc5a092c19322c -ra37ea507632afd8fefc92fec5e3246dcbc86b4b0
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs)	(revision de3f91fbadb5d63b1c0128aa37fc5a092c19322c)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs)	(revision a37ea507632afd8fefc92fec5e3246dcbc86b4b0)
@@ -32,11 +32,8 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Forms.PresentationObjects;
-using Riskeer.Common.Plugin.TestUtil;
 using Riskeer.Revetment.Data;
 using Riskeer.Revetment.Data.TestUtil;
 using Riskeer.Revetment.Forms.Views;
@@ -48,7 +45,7 @@
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.ViewInfos
 {
     [TestFixture]
-    public class WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest : ShouldCloseViewWithCalculationDataTester
+    public class WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest
     {
         private const int lowerBoundaryRevetmentChartDataIndex = 1;
         private const int upperBoundaryRevetmentChartDataIndex = 2;
@@ -156,69 +153,9 @@
                 Assert.IsEmpty(designWaterLevelChartData.Points);
             }
         }
+    
+        #region CloseForData
 
-        #region ShouldCloseViewWithCalculationDataTester
-
-        protected override bool ShouldCloseMethod(IView view, object o)
-        {
-            return info.CloseForData(view, o);
-        }
-
-        protected override IView GetView(ICalculation data)
-        {
-            return new WaveConditionsInputView((ICalculation<WaveConditionsInput>) data,
-                                               () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
-                                               new WaveImpactAsphaltCoverWaveConditionsInputViewStyle());
-        }
-
-        protected override ICalculation GetCalculation()
-        {
-            return new WaveImpactAsphaltCoverWaveConditionsCalculation();
-        }
-
-        protected override ICalculationContext<ICalculation, IFailureMechanism> GetCalculationContextWithCalculation()
-        {
-            return new WaveImpactAsphaltCoverWaveConditionsCalculationContext(
-                new WaveImpactAsphaltCoverWaveConditionsCalculation(),
-                new CalculationGroup(),
-                new WaveImpactAsphaltCoverFailureMechanism(),
-                new AssessmentSectionStub());
-        }
-
-        protected override ICalculationContext<CalculationGroup, IFailureMechanism> GetCalculationGroupContextWithCalculation()
-        {
-            return new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(
-                new CalculationGroup
-                {
-                    Children =
-                    {
-                        new WaveImpactAsphaltCoverWaveConditionsCalculation()
-                    }
-                },
-                null,
-                new WaveImpactAsphaltCoverFailureMechanism(),
-                new AssessmentSectionStub());
-        }
-
-        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
-        {
-            return new WaveImpactAsphaltCoverHydraulicLoadsContext(
-                new WaveImpactAsphaltCoverFailureMechanism
-                {
-                    WaveConditionsCalculationGroup =
-                    {
-                        Children =
-                        {
-                            new WaveImpactAsphaltCoverWaveConditionsCalculation()
-                        }
-                    }
-                }, new AssessmentSectionStub());
-        }
-
-        #endregion
-        
-                #region CloseForData
-
         [Test]
         public void CloseForData_ViewCorrespondingToRemovedCalculationContext_ReturnsTrue()
         {
@@ -618,6 +555,13 @@
                 mocks.VerifyAll();
             }
         }
+        
+        private static IView GetView(ICalculation data)
+        {
+            return new WaveConditionsInputView((ICalculation<WaveConditionsInput>) data,
+                                               () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
+                                               new WaveImpactAsphaltCoverWaveConditionsInputViewStyle());
+        }
 
         #endregion
     }