Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r5cda5c678f851ca73666ea377aa8d2dc8d659bfe -r51f3e2b74a3a367dbd5688d77d04ab8348738c8c
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 5cda5c678f851ca73666ea377aa8d2dc8d659bfe)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 51f3e2b74a3a367dbd5688d77d04ab8348738c8c)
@@ -40,13 +40,6 @@
         ProbabilisticFaultTreePipingProfileSpecificOutputView, ProbabilisticPipingProfileSpecificOutputContext, TopLevelFaultTreeIllustrationPoint>
     {
         protected override string ViewName => "Sterkte berekening doorsnede";
-        
-        protected override IView GetView(ICalculation data)
-        {
-            return new ProbabilisticFaultTreePipingProfileSpecificOutputView(
-                (ProbabilisticPipingCalculationScenario) data,
-                () => new TestGeneralResultFaultTreeIllustrationPoint());
-        }
 
         protected override ProbabilisticPipingProfileSpecificOutputContext GetContext(ProbabilisticPipingCalculationScenario calculationScenario)
         {
@@ -56,14 +49,36 @@
 
         protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult)
         {
-            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult),
-                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult));
+            return OutputWithCorrectIllustrationPoints(generalResult);
         }
 
         protected override ProbabilisticPipingOutput GetOutputWithIncorrectIllustrationPoints()
         {
             return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(),
                                                  PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput());
         }
+        
+        private static ProbabilisticPipingOutput OutputWithCorrectIllustrationPoints(GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult)
+        {
+            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult),
+                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult));
+        }
+
+        [TestFixture]
+        public class ShouldCloseProbabilisticFaultTreePipingProfileSpecificOutputView : ShouldCloseProbabilisticPipingOutputViewTester
+        {
+            protected override IView GetView(ICalculation data)
+            {
+                return new ProbabilisticFaultTreePipingProfileSpecificOutputView(
+                    (ProbabilisticPipingCalculationScenario) data,
+                    () => new TestGeneralResultFaultTreeIllustrationPoint());
+            }
+
+            protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(
+                GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult)
+            {
+                return OutputWithCorrectIllustrationPoints(generalResult);
+            }
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r5cda5c678f851ca73666ea377aa8d2dc8d659bfe -r51f3e2b74a3a367dbd5688d77d04ab8348738c8c
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 5cda5c678f851ca73666ea377aa8d2dc8d659bfe)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 51f3e2b74a3a367dbd5688d77d04ab8348738c8c)
@@ -40,28 +40,42 @@
     {
         protected override string ViewName => "Sterkte berekening vak";
 
-        protected override IView GetView(ICalculation data)
-        {
-            return new ProbabilisticFaultTreePipingSectionSpecificOutputView(
-                (ProbabilisticPipingCalculationScenario) data,
-                () => new TestGeneralResultFaultTreeIllustrationPoint());
-        }
-
         protected override ProbabilisticPipingSectionSpecificOutputContext GetContext(ProbabilisticPipingCalculationScenario calculationScenario)
         {
             return new ProbabilisticPipingSectionSpecificOutputContext(calculationScenario);
         }
 
         protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult)
         {
-            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult),
-                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult));
+            return OutputWithCorrectIllustrationPoints(generalResult);
         }
 
         protected override ProbabilisticPipingOutput GetOutputWithIncorrectIllustrationPoints()
         {
             return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(),
                                                  PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput());
         }
+        
+        private static ProbabilisticPipingOutput OutputWithCorrectIllustrationPoints(GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult)
+        {
+            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult),
+                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(generalResult));
+        }
+
+        [TestFixture]
+        public class ShouldCloseProbabilisticFaultTreePipingSectionSpecificOutputView : ShouldCloseProbabilisticPipingOutputViewTester
+        {
+            protected override IView GetView(ICalculation data)
+            {
+                return new ProbabilisticFaultTreePipingSectionSpecificOutputView(
+                    (ProbabilisticPipingCalculationScenario) data,
+                    () => new TestGeneralResultFaultTreeIllustrationPoint());
+            }
+
+            protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult)
+            {
+                return OutputWithCorrectIllustrationPoints(generalResult);
+            }
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingOutputViewInfoTestBase.cs
===================================================================
diff -u -r82a5973b3828fbc6f97f434f688d7b83590323f7 -r51f3e2b74a3a367dbd5688d77d04ab8348738c8c
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingOutputViewInfoTestBase.cs	(.../ProbabilisticPipingOutputViewInfoTestBase.cs)	(revision 82a5973b3828fbc6f97f434f688d7b83590323f7)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingOutputViewInfoTestBase.cs	(.../ProbabilisticPipingOutputViewInfoTestBase.cs)	(revision 51f3e2b74a3a367dbd5688d77d04ab8348738c8c)
@@ -48,17 +48,13 @@
     /// <typeparam name="TOutputContext">The type of output context.</typeparam>
     /// <typeparam name="TTopLevelIllustrationPoint">The type of the top level illustration point.</typeparam>
     [Apartment(ApartmentState.STA)]
-    public abstract class ProbabilisticPipingOutputViewInfoTestBase<TView, TOutputContext, TTopLevelIllustrationPoint> : ShouldCloseViewWithCalculationDataTester
-        where TView : IView where TTopLevelIllustrationPoint : TopLevelIllustrationPointBase
+    public abstract class ProbabilisticPipingOutputViewInfoTestBase<TView, TOutputContext, TTopLevelIllustrationPoint>
+        where TView : IView
+        where TTopLevelIllustrationPoint : TopLevelIllustrationPointBase
     {
         private PipingPlugin plugin;
         private ViewInfo info;
 
-        /// <summary>
-        /// Gets the name of the view.
-        /// </summary>
-        protected abstract string ViewName { get; }
-
         [SetUp]
         public void SetUp()
         {
@@ -182,149 +178,165 @@
             Assert.IsInstanceOf<TView>(view);
         }
 
-        [Test]
-        public void CloseForData_ViewCorrespondingToRemovedOutput_ReturnsTrue()
-        {
-            // Setup
-            var calculationScenario = new ProbabilisticPipingCalculationScenario
-            {
-                Output = GetOutputWithCorrectIllustrationPoints(null)
-            };
+        /// <summary>
+        /// Gets the name of the view.
+        /// </summary>
+        protected abstract string ViewName { get; }
 
-            using (IView view = GetView(calculationScenario))
-            {
-                // Call
-                bool closeForData = info.CloseForData(view, calculationScenario.Output);
+        protected abstract TOutputContext GetContext(ProbabilisticPipingCalculationScenario calculationScenario);
 
-                // Assert
-                Assert.IsTrue(closeForData);
-            }
+        protected abstract ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TTopLevelIllustrationPoint> generalResult);
+
+        protected abstract ProbabilisticPipingOutput GetOutputWithIncorrectIllustrationPoints();
+
+        private static GeneralResult<TTopLevelIllustrationPoint> GetGeneralResult()
+        {
+            return new GeneralResult<TTopLevelIllustrationPoint>(
+                new WindDirection("test", 0),
+                new Stochast[0],
+                new TTopLevelIllustrationPoint[0]);
         }
 
-        [Test]
-        public void CloseForData_ViewNotCorrespondingToRemovedOutput_ReturnsFalse()
+        [TestFixture]
+        public abstract class ShouldCloseProbabilisticPipingOutputViewTester : ShouldCloseViewWithCalculationDataTester
         {
-            // Setup
-            var calculationScenario = new ProbabilisticPipingCalculationScenario
+            [Test]
+            public void ShouldCloseMethod_ViewCorrespondingToRemovedOutput_ReturnsTrue()
             {
-                Output = GetOutputWithCorrectIllustrationPoints(null)
-            };
+                // Setup
+                var calculationScenario = new ProbabilisticPipingCalculationScenario
+                {
+                    Output = GetOutputWithCorrectIllustrationPoints(null)
+                };
 
-            using (IView view = GetView(calculationScenario))
-            {
-                // Call
-                bool closeForData = info.CloseForData(view, GetOutputWithCorrectIllustrationPoints(null));
+                using (IView view = GetView(calculationScenario))
+                {
+                    // Call
+                    bool closeForData = ShouldCloseMethod(view, calculationScenario.Output);
 
-                // Assert
-                Assert.IsFalse(closeForData);
+                    // Assert
+                    Assert.IsTrue(closeForData);
+                }
             }
-        }
 
-        [Test]
-        public void CloseForData_ViewCorrespondingToRemovedIllustrationPoints_ReturnsTrue()
-        {
-            // Setup
-            GeneralResult<TTopLevelIllustrationPoint> illustrationPoints = GetGeneralResult();
-
-            var calculationScenario = new ProbabilisticPipingCalculationScenario
+            [Test]
+            public void ShouldCloseMethod_ViewNotCorrespondingToRemovedOutput_ReturnsFalse()
             {
-                Output = GetOutputWithCorrectIllustrationPoints(illustrationPoints)
-            };
+                // Setup
+                var calculationScenario = new ProbabilisticPipingCalculationScenario
+                {
+                    Output = GetOutputWithCorrectIllustrationPoints(null)
+                };
 
-            using (IView view = GetView(calculationScenario))
-            {
-                // Call
-                bool closeForData = info.CloseForData(view, illustrationPoints);
+                using (IView view = GetView(calculationScenario))
+                {
+                    // Call
+                    bool closeForData = ShouldCloseMethod(view, GetOutputWithCorrectIllustrationPoints(null));
 
-                // Assert
-                Assert.IsTrue(closeForData);
+                    // Assert
+                    Assert.IsFalse(closeForData);
+                }
             }
-        }
 
-        [Test]
-        public void CloseForData_ViewNotCorrespondingToRemovedIllustrationPoints_ReturnsFalse()
-        {
-            // Setup
-            var calculationScenario = new ProbabilisticPipingCalculationScenario
+            [Test]
+            public void ShouldCloseMethod_ViewCorrespondingToRemovedIllustrationPoints_ReturnsTrue()
             {
-                Output = GetOutputWithCorrectIllustrationPoints(GetGeneralResult())
-            };
+                // Setup
+                GeneralResult<TTopLevelIllustrationPoint> illustrationPoints = GetGeneralResult();
 
-            using (IView view = GetView(calculationScenario))
-            {
-                // Call
-                bool closeForData = info.CloseForData(view, GetGeneralResult());
+                var calculationScenario = new ProbabilisticPipingCalculationScenario
+                {
+                    Output = GetOutputWithCorrectIllustrationPoints(illustrationPoints)
+                };
 
-                // Assert
-                Assert.IsFalse(closeForData);
+                using (IView view = GetView(calculationScenario))
+                {
+                    // Call
+                    bool closeForData = ShouldCloseMethod(view, illustrationPoints);
+
+                    // Assert
+                    Assert.IsTrue(closeForData);
+                }
             }
-        }
 
-        protected abstract TOutputContext GetContext(ProbabilisticPipingCalculationScenario calculationScenario);
+            [Test]
+            public void ShouldCloseMethod_ViewNotCorrespondingToRemovedIllustrationPoints_ReturnsFalse()
+            {
+                // Setup
+                var calculationScenario = new ProbabilisticPipingCalculationScenario
+                {
+                    Output = GetOutputWithCorrectIllustrationPoints(GetGeneralResult())
+                };
 
-        protected abstract ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TTopLevelIllustrationPoint> generalResult);
+                using (IView view = GetView(calculationScenario))
+                {
+                    // Call
+                    bool closeForData = ShouldCloseMethod(view, GetGeneralResult());
 
-        protected abstract ProbabilisticPipingOutput GetOutputWithIncorrectIllustrationPoints();
+                    // Assert
+                    Assert.IsFalse(closeForData);
+                }
+            }
 
-        protected override bool ShouldCloseMethod(IView view, object o)
-        {
-            return info.CloseForData(view, o);
-        }
+            protected abstract ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TTopLevelIllustrationPoint> generalResult);
 
-        protected override ICalculation GetCalculation()
-        {
-            return new ProbabilisticPipingCalculationScenario();
-        }
+            protected override bool ShouldCloseMethod(IView view, object o)
+            {
+                using (var plugin = new PipingPlugin())
+                {
+                    return plugin.GetViewInfos()
+                                 .First(tni => tni.ViewType == typeof(TView))
+                                 .CloseForData(view, o);
+                }
+            }
 
-        protected override ICalculationContext<ICalculation, IFailureMechanism> GetCalculationContextWithCalculation()
-        {
-            return new ProbabilisticPipingCalculationScenarioContext(
-                new ProbabilisticPipingCalculationScenario(),
-                new CalculationGroup(),
-                Enumerable.Empty<PipingSurfaceLine>(),
-                Enumerable.Empty<PipingStochasticSoilModel>(),
-                new PipingFailureMechanism(),
-                new AssessmentSectionStub());
-        }
+            protected override ICalculation GetCalculation()
+            {
+                return new ProbabilisticPipingCalculationScenario();
+            }
 
-        protected override ICalculationContext<CalculationGroup, IFailureMechanism> GetCalculationGroupContextWithCalculation()
-        {
-            return new PipingCalculationGroupContext(
-                new CalculationGroup
-                {
-                    Children =
-                    {
-                        new ProbabilisticPipingCalculationScenario()
-                    }
-                },
-                null,
-                Enumerable.Empty<PipingSurfaceLine>(),
-                Enumerable.Empty<PipingStochasticSoilModel>(),
-                new PipingFailureMechanism(),
-                new AssessmentSectionStub());
-        }
+            protected override ICalculationContext<ICalculation, IFailureMechanism> GetCalculationContextWithCalculation()
+            {
+                return new ProbabilisticPipingCalculationScenarioContext(
+                    new ProbabilisticPipingCalculationScenario(),
+                    new CalculationGroup(),
+                    Enumerable.Empty<PipingSurfaceLine>(),
+                    Enumerable.Empty<PipingStochasticSoilModel>(),
+                    new PipingFailureMechanism(),
+                    new AssessmentSectionStub());
+            }
 
-        protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
-        {
-            return new PipingFailureMechanismContext(
-                new PipingFailureMechanism
-                {
-                    CalculationsGroup =
+            protected override ICalculationContext<CalculationGroup, IFailureMechanism> GetCalculationGroupContextWithCalculation()
+            {
+                return new PipingCalculationGroupContext(
+                    new CalculationGroup
                     {
                         Children =
                         {
                             new ProbabilisticPipingCalculationScenario()
                         }
-                    }
-                }, new AssessmentSectionStub());
-        }
+                    },
+                    null,
+                    Enumerable.Empty<PipingSurfaceLine>(),
+                    Enumerable.Empty<PipingStochasticSoilModel>(),
+                    new PipingFailureMechanism(),
+                    new AssessmentSectionStub());
+            }
 
-        private static GeneralResult<TTopLevelIllustrationPoint> GetGeneralResult()
-        {
-            return new GeneralResult<TTopLevelIllustrationPoint>(
-                new WindDirection("test", 0),
-                new Stochast[0],
-                new TTopLevelIllustrationPoint[0]);
+            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            {
+                return new PipingFailureMechanismContext(
+                    new PipingFailureMechanism
+                    {
+                        CalculationsGroup =
+                        {
+                            Children =
+                            {
+                                new ProbabilisticPipingCalculationScenario()
+                            }
+                        }
+                    }, new AssessmentSectionStub());
+            }
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r5cda5c678f851ca73666ea377aa8d2dc8d659bfe -r51f3e2b74a3a367dbd5688d77d04ab8348738c8c
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 5cda5c678f851ca73666ea377aa8d2dc8d659bfe)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 51f3e2b74a3a367dbd5688d77d04ab8348738c8c)
@@ -42,13 +42,6 @@
     {
         protected override string ViewName => "Sterkte berekening doorsnede";
 
-        protected override IView GetView(ICalculation data)
-        {
-            return new ProbabilisticSubMechanismPipingProfileSpecificOutputView(
-                (ProbabilisticPipingCalculationScenario) data,
-                () => new TestGeneralResultSubMechanismIllustrationPoint());
-        }
-
         protected override ProbabilisticPipingProfileSpecificOutputContext GetContext(ProbabilisticPipingCalculationScenario calculationScenario)
         {
             return new ProbabilisticPipingProfileSpecificOutputContext(
@@ -57,14 +50,35 @@
 
         protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
-            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult),
-                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult));
+            return OutputWithCorrectIllustrationPoints(generalResult);
         }
 
         protected override ProbabilisticPipingOutput GetOutputWithIncorrectIllustrationPoints()
         {
             return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(),
                                                  PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput());
         }
+        
+        private static ProbabilisticPipingOutput OutputWithCorrectIllustrationPoints(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
+        {
+            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult),
+                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult));
+        }
+
+        [TestFixture]
+        public class ShouldCloseProbabilisticSubMechanismPipingProfileSpecificOutputViewTester : ShouldCloseProbabilisticPipingOutputViewTester
+        {
+            protected override IView GetView(ICalculation data)
+            {
+                return new ProbabilisticSubMechanismPipingProfileSpecificOutputView(
+                    (ProbabilisticPipingCalculationScenario) data,
+                    () => new TestGeneralResultSubMechanismIllustrationPoint());
+            }
+
+            protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
+            {
+                return OutputWithCorrectIllustrationPoints(generalResult);
+            }
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r5cda5c678f851ca73666ea377aa8d2dc8d659bfe -r51f3e2b74a3a367dbd5688d77d04ab8348738c8c
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 5cda5c678f851ca73666ea377aa8d2dc8d659bfe)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 51f3e2b74a3a367dbd5688d77d04ab8348738c8c)
@@ -40,28 +40,42 @@
     {
         protected override string ViewName => "Sterkte berekening vak";
 
-        protected override IView GetView(ICalculation data)
-        {
-            return new ProbabilisticSubMechanismPipingSectionSpecificOutputView(
-                (ProbabilisticPipingCalculationScenario) data,
-                () => new TestGeneralResultSubMechanismIllustrationPoint());
-        }
-
         protected override ProbabilisticPipingSectionSpecificOutputContext GetContext(ProbabilisticPipingCalculationScenario calculationScenario)
         {
             return new ProbabilisticPipingSectionSpecificOutputContext(calculationScenario);
         }
 
         protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
-            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult),
-                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult));
+            return OutputWithCorrectIllustrationPoints(generalResult);
         }
 
         protected override ProbabilisticPipingOutput GetOutputWithIncorrectIllustrationPoints()
         {
             return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(),
                                                  PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput());
         }
+        
+        private static ProbabilisticPipingOutput OutputWithCorrectIllustrationPoints(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
+        {
+            return new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult),
+                                                 PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput(generalResult));
+        }
+
+        [TestFixture]
+        public class ShouldCloseProbabilisticSubMechanismPipingSectionSpecificOutputView : ShouldCloseProbabilisticPipingOutputViewTester
+        {
+            protected override IView GetView(ICalculation data)
+            {
+                return new ProbabilisticSubMechanismPipingSectionSpecificOutputView(
+                    (ProbabilisticPipingCalculationScenario) data,
+                    () => new TestGeneralResultSubMechanismIllustrationPoint());
+            }
+
+            protected override ProbabilisticPipingOutput GetOutputWithCorrectIllustrationPoints(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
+            {
+                return OutputWithCorrectIllustrationPoints(generalResult);
+            }
+        }
     }
 }
\ No newline at end of file