Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs
===================================================================
diff -u -rdae442c6068528e9ef8c3862902594ab6c9e7dc1 -rae3b6071cc741eb866b766f9cc850fdaa30cceee
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision dae442c6068528e9ef8c3862902594ab6c9e7dc1)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision ae3b6071cc741eb866b766f9cc850fdaa30cceee)
@@ -36,6 +36,8 @@
     public class DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewInfoTest :
         GrassCoverErosionInwardsOutputViewInfoTestBase<DikeHeightOutputGeneralResultFaultTreeIllustrationPointView, DikeHeightOutputContext>
     {
+        protected override string ViewName => "HBN";
+
         [Test]
         public void AdditionalDataCheck_CalculationWithoutDikeHeightOutput_ReturnsFalse()
         {
@@ -47,26 +49,28 @@
                                                             new TestOvertoppingRateOutput(0.2))
             };
             DikeHeightOutputContext context = GetContext(calculation);
-            
+
             // Call
             bool additionalDataCheck = Info.AdditionalDataCheck(context);
-            
+
             // Assert
             Assert.IsFalse(additionalDataCheck);
         }
-        
-        protected override string ViewName => "HBN";
 
-        protected override IView GetView(ICalculation data)
+        protected override DikeHeightOutputContext GetContext(GrassCoverErosionInwardsCalculation calculation)
         {
-            return new DikeHeightOutputGeneralResultFaultTreeIllustrationPointView(
-                (GrassCoverErosionInwardsCalculation) data,
-                () => new TestGeneralResultFaultTreeIllustrationPoint());
+            return new DikeHeightOutputContext(calculation);
         }
 
-        protected override DikeHeightOutputContext GetContext(GrassCoverErosionInwardsCalculation calculation)
+        [TestFixture]
+        public class ShouldCloseDikeHeightOutputGeneralResultFaultTreeIllustrationPointView : ShouldCloseGrassCoverErosionInwardsOutputViewTester
         {
-            return new DikeHeightOutputContext(calculation);
+            protected override IView GetView(ICalculation data)
+            {
+                return new DikeHeightOutputGeneralResultFaultTreeIllustrationPointView(
+                    (GrassCoverErosionInwardsCalculation) data,
+                    () => new TestGeneralResultFaultTreeIllustrationPoint());
+            }
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs
===================================================================
diff -u -re0a88f71042cb81b5d87bf9b7b42d87205ed2c4c -rae3b6071cc741eb866b766f9cc850fdaa30cceee
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs	(.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs)	(revision e0a88f71042cb81b5d87bf9b7b42d87205ed2c4c)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs	(.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs)	(revision ae3b6071cc741eb866b766f9cc850fdaa30cceee)
@@ -44,21 +44,11 @@
     /// <typeparam name="TView">The type of view.</typeparam>
     /// <typeparam name="TOutputContext">The type of output context.</typeparam>
     [Apartment(ApartmentState.STA)]
-    public abstract class GrassCoverErosionInwardsOutputViewInfoTestBase<TView, TOutputContext> : ShouldCloseViewWithCalculationDataTester
+    public abstract class GrassCoverErosionInwardsOutputViewInfoTestBase<TView, TOutputContext>
         where TView : IView
     {
         private GrassCoverErosionInwardsPlugin plugin;
 
-        /// <summary>
-        /// Gets the name of the view.
-        /// </summary>
-        protected abstract string ViewName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ViewInfo"/>.
-        /// </summary>
-        protected ViewInfo Info { get; private set; }
-
         [SetUp]
         public void SetUp()
         {
@@ -104,21 +94,21 @@
             // Assert
             Assert.AreSame(calculation, viewData);
         }
-        
+
         [Test]
         public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsFalse()
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation();
             TOutputContext context = GetContext(calculation);
-            
+
             // Call
             bool additionalDataCheck = Info.AdditionalDataCheck(context);
-            
+
             // Assert
             Assert.IsFalse(additionalDataCheck);
         }
-        
+
         [Test]
         public void AdditionalDataCheck_CalculationWithOutputWithoutIllustrationPoints_ReturnsFalse()
         {
@@ -128,14 +118,14 @@
                 Output = new TestGrassCoverErosionInwardsOutput()
             };
             TOutputContext context = GetContext(calculation);
-            
+
             // Call
             bool additionalDataCheck = Info.AdditionalDataCheck(context);
-            
+
             // Assert
             Assert.IsFalse(additionalDataCheck);
         }
-        
+
         [Test]
         public void AdditionalDataCheck_CalculationWithOutputAndIllustrationPoints_ReturnsTrue()
         {
@@ -145,10 +135,10 @@
                 Output = new TestGrassCoverErosionInwardsOutput(new TestGeneralResultFaultTreeIllustrationPoint())
             };
             TOutputContext context = GetContext(calculation);
-            
+
             // Call
             bool additionalDataCheck = Info.AdditionalDataCheck(context);
-            
+
             // Assert
             Assert.IsTrue(additionalDataCheck);
         }
@@ -159,7 +149,7 @@
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation();
             TOutputContext context = GetContext(calculation);
-            
+
             // Call
             IView view = Info.CreateInstance(context);
 
@@ -168,59 +158,78 @@
         }
 
         /// <summary>
+        /// Gets the name of the view.
+        /// </summary>
+        protected abstract string ViewName { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ViewInfo"/>.
+        /// </summary>
+        protected ViewInfo Info { get; private set; }
+
+        /// <summary>
         /// Returns an output context object.
         /// </summary>
         /// <param name="calculation">The calculation that must be set as wrapped data of the context.</param>
         /// <returns>An output context object.</returns>
         protected abstract TOutputContext GetContext(GrassCoverErosionInwardsCalculation calculation);
 
-        protected override bool ShouldCloseMethod(IView view, object o)
+        [TestFixture]
+        public abstract class ShouldCloseGrassCoverErosionInwardsOutputViewTester : ShouldCloseViewWithCalculationDataTester
         {
-            return Info.CloseForData(view, o);
-        }
+            protected override bool ShouldCloseMethod(IView view, object o)
+            {
+                using (var plugin = new GrassCoverErosionInwardsPlugin())
+                {
+                    return plugin.GetViewInfos()
+                                 .First(tni => tni.ViewType == typeof(TView))
+                                 .CloseForData(view, o);
+                }
+            }
 
-        protected override ICalculation GetCalculation()
-        {
-            return new GrassCoverErosionInwardsCalculation();
-        }
+            protected override ICalculation GetCalculation()
+            {
+                return new GrassCoverErosionInwardsCalculation();
+            }
 
-        protected override ICalculationContext<ICalculation, IFailureMechanism> GetCalculationContextWithCalculation()
-        {
-            return new GrassCoverErosionInwardsCalculationScenarioContext(new GrassCoverErosionInwardsCalculationScenario(),
-                                                                          new CalculationGroup(),
-                                                                          new GrassCoverErosionInwardsFailureMechanism(),
-                                                                          new AssessmentSectionStub());
-        }
+            protected override ICalculationContext<ICalculation, IFailureMechanism> GetCalculationContextWithCalculation()
+            {
+                return new GrassCoverErosionInwardsCalculationScenarioContext(new GrassCoverErosionInwardsCalculationScenario(),
+                                                                              new CalculationGroup(),
+                                                                              new GrassCoverErosionInwardsFailureMechanism(),
+                                                                              new AssessmentSectionStub());
+            }
 
-        protected override ICalculationContext<CalculationGroup, IFailureMechanism> GetCalculationGroupContextWithCalculation()
-        {
-            return new GrassCoverErosionInwardsCalculationGroupContext(
-                new CalculationGroup
-                {
-                    Children =
+            protected override ICalculationContext<CalculationGroup, IFailureMechanism> GetCalculationGroupContextWithCalculation()
+            {
+                return new GrassCoverErosionInwardsCalculationGroupContext(
+                    new CalculationGroup
                     {
-                        new GrassCoverErosionInwardsCalculation()
-                    }
-                },
-                null,
-                new GrassCoverErosionInwardsFailureMechanism(),
-                new AssessmentSectionStub());
-        }
-
-        protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
-        {
-            return new GrassCoverErosionInwardsFailureMechanismContext(
-                new GrassCoverErosionInwardsFailureMechanism
-                {
-                    CalculationsGroup =
-                    {
                         Children =
                         {
                             new GrassCoverErosionInwardsCalculation()
                         }
-                    }
-                },
-                new AssessmentSectionStub());
+                    },
+                    null,
+                    new GrassCoverErosionInwardsFailureMechanism(),
+                    new AssessmentSectionStub());
+            }
+
+            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            {
+                return new GrassCoverErosionInwardsFailureMechanismContext(
+                    new GrassCoverErosionInwardsFailureMechanism
+                    {
+                        CalculationsGroup =
+                        {
+                            Children =
+                            {
+                                new GrassCoverErosionInwardsCalculation()
+                            }
+                        }
+                    },
+                    new AssessmentSectionStub());
+            }
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs
===================================================================
diff -u -r7f83f6036c43b1fbccec621de33a4efbb85f3983 -rae3b6071cc741eb866b766f9cc850fdaa30cceee
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision 7f83f6036c43b1fbccec621de33a4efbb85f3983)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision ae3b6071cc741eb866b766f9cc850fdaa30cceee)
@@ -38,17 +38,21 @@
     {
         protected override string ViewName => "Sterkte berekening";
 
-        protected override IView GetView(ICalculation data)
-        {
-            return new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView(
-                (GrassCoverErosionInwardsCalculation) data,
-                () => new TestGeneralResultFaultTreeIllustrationPoint());
-        }
-
         protected override OvertoppingOutputContext GetContext(GrassCoverErosionInwardsCalculation calculation)
         {
             return new OvertoppingOutputContext(calculation, new GrassCoverErosionInwardsFailureMechanism(),
                                                 new AssessmentSectionStub());
         }
+
+        [TestFixture]
+        public class ShouldCloseOvertoppingOutputGeneralResultFaultTreeIllustrationPointView : ShouldCloseGrassCoverErosionInwardsOutputViewTester
+        {
+            protected override IView GetView(ICalculation data)
+            {
+                return new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView(
+                    (GrassCoverErosionInwardsCalculation) data,
+                    () => new TestGeneralResultFaultTreeIllustrationPoint());
+            }
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs
===================================================================
diff -u -rdae442c6068528e9ef8c3862902594ab6c9e7dc1 -rae3b6071cc741eb866b766f9cc850fdaa30cceee
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision dae442c6068528e9ef8c3862902594ab6c9e7dc1)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision ae3b6071cc741eb866b766f9cc850fdaa30cceee)
@@ -34,6 +34,8 @@
     public class OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewInfoTest :
         GrassCoverErosionInwardsOutputViewInfoTestBase<OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointView, OvertoppingRateOutputContext>
     {
+        protected override string ViewName => "Overslagdebiet";
+
         [Test]
         public void AdditionalDataCheck_CalculationWithoutOvertoppingRateOutput_ReturnsFalse()
         {
@@ -45,25 +47,28 @@
                                                             null)
             };
             OvertoppingRateOutputContext context = GetContext(calculation);
-            
+
             // Call
             bool additionalDataCheck = Info.AdditionalDataCheck(context);
-            
+
             // Assert
             Assert.IsFalse(additionalDataCheck);
         }
-        
-        protected override string ViewName => "Overslagdebiet";
 
-        protected override IView GetView(ICalculation data)
+        protected override OvertoppingRateOutputContext GetContext(GrassCoverErosionInwardsCalculation calculation)
         {
-            return new OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointView(
-                (GrassCoverErosionInwardsCalculation) data, () => new TestGeneralResultFaultTreeIllustrationPoint());
+            return new OvertoppingRateOutputContext(calculation);
         }
 
-        protected override OvertoppingRateOutputContext GetContext(GrassCoverErosionInwardsCalculation calculation)
+        [TestFixture]
+        public class ShouldCloseOvertoppingRateOutputGeneralResultFaultTreeIllustrationPointView : ShouldCloseGrassCoverErosionInwardsOutputViewTester
         {
-            return new OvertoppingRateOutputContext(calculation);
+            protected override IView GetView(ICalculation data)
+            {
+                return new OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointView(
+                    (GrassCoverErosionInwardsCalculation) data,
+                    () => new TestGeneralResultFaultTreeIllustrationPoint());
+            }
         }
     }
 }
\ No newline at end of file