Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs	(.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs	(.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs)	(revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea)
@@ -153,20 +153,18 @@
                 new AssessmentSectionStub());
         }
 
-        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+        protected override IFailureMechanism GetFailureMechanismWithCalculation()
         {
-            return new GrassCoverErosionInwardsCalculationsContext(
-                new GrassCoverErosionInwardsFailureMechanism
+            return new GrassCoverErosionInwardsFailureMechanism
+            {
+                CalculationsGroup =
                 {
-                    CalculationsGroup =
+                    Children =
                     {
-                        Children =
-                        {
-                            new GrassCoverErosionInwardsCalculation()
-                        }
+                        new GrassCoverErosionInwardsCalculation()
                     }
-                },
-                new AssessmentSectionStub());
+                }
+            };
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea)
@@ -167,20 +167,18 @@
                     new AssessmentSection(AssessmentSectionComposition.Dike));
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new HeightStructuresCalculationsContext(
-                    new HeightStructuresFailureMechanism
+                return new HeightStructuresFailureMechanism
+                {
+                    CalculationsGroup =
                     {
-                        CalculationsGroup =
+                        Children =
                         {
-                            Children =
-                            {
-                                new StructuresCalculation<HeightStructuresInput>()
-                            }
+                            new StructuresCalculation<HeightStructuresInput>()
                         }
-                    },
-                    new AssessmentSection(AssessmentSectionComposition.Dike));
+                    }
+                };
             }
         }
 
@@ -216,9 +214,9 @@
                     new AssessmentSection(AssessmentSectionComposition.Dike));
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new ClosingStructuresCalculationsContext(
+                return
                     new ClosingStructuresFailureMechanism
                     {
                         CalculationsGroup =
@@ -228,8 +226,7 @@
                                 new StructuresCalculation<ClosingStructuresInput>()
                             }
                         }
-                    },
-                    new AssessmentSection(AssessmentSectionComposition.Dike));
+                    };
             }
         }
 
@@ -265,20 +262,18 @@
                     new AssessmentSection(AssessmentSectionComposition.Dike));
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new StabilityPointStructuresCalculationsContext(
-                    new StabilityPointStructuresFailureMechanism
+                return new StabilityPointStructuresFailureMechanism
+                {
+                    CalculationsGroup =
                     {
-                        CalculationsGroup =
+                        Children =
                         {
-                            Children =
-                            {
-                                new StructuresCalculation<StabilityPointStructuresInput>()
-                            }
+                            new StructuresCalculation<StabilityPointStructuresInput>()
                         }
-                    },
-                    new AssessmentSection(AssessmentSectionComposition.Dike));
+                    }
+                };
             }
         }
     }
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs	(.../MacroStabilityInwardsOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs	(.../MacroStabilityInwardsOutputViewInfoTest.cs)	(revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea)
@@ -169,19 +169,18 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new MacroStabilityInwardsCalculationsContext(
-                    new MacroStabilityInwardsFailureMechanism
+                return new MacroStabilityInwardsFailureMechanism
+                {
+                    CalculationsGroup =
                     {
-                        CalculationsGroup =
+                        Children =
                         {
-                            Children =
-                            {
-                                new MacroStabilityInwardsCalculationScenario()
-                            }
+                            new MacroStabilityInwardsCalculationScenario()
                         }
-                    }, new AssessmentSectionStub());
+                    }
+                };
             }
         }
     }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea)
@@ -213,19 +213,18 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new PipingCalculationsContext(
-                    new PipingFailureMechanism
+                return new PipingFailureMechanism
+                {
+                    CalculationsGroup =
                     {
-                        CalculationsGroup =
+                        Children =
                         {
-                            Children =
-                            {
-                                new ProbabilisticPipingCalculationScenario()
-                            }
+                            new ProbabilisticPipingCalculationScenario()
                         }
-                    }, new AssessmentSectionStub());
+                    }
+                };
             }
         }
     }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea)
@@ -214,19 +214,18 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new PipingCalculationsContext(
-                    new PipingFailureMechanism
+                return new PipingFailureMechanism
+                {
+                    CalculationsGroup =
                     {
-                        CalculationsGroup =
+                        Children =
                         {
-                            Children =
-                            {
-                                new ProbabilisticPipingCalculationScenario()
-                            }
+                            new ProbabilisticPipingCalculationScenario()
                         }
-                    }, new AssessmentSectionStub());
+                    }
+                };
             }
         }
     }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea)
@@ -213,19 +213,18 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new PipingCalculationsContext(
-                    new PipingFailureMechanism
+                return new PipingFailureMechanism
+                {
+                    CalculationsGroup =
                     {
-                        CalculationsGroup =
+                        Children =
                         {
-                            Children =
-                            {
-                                new ProbabilisticPipingCalculationScenario()
-                            }
+                            new ProbabilisticPipingCalculationScenario()
                         }
-                    }, new AssessmentSectionStub());
+                    }
+                };
             }
         }
     }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -rdfba5c4a990d4e4ece313fe7cd9daee3836666ea
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision dfba5c4a990d4e4ece313fe7cd9daee3836666ea)
@@ -214,19 +214,18 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailureMechanism GetFailureMechanismWithCalculation()
             {
-                return new PipingCalculationsContext(
-                    new PipingFailureMechanism
+                return new PipingFailureMechanism
+                {
+                    CalculationsGroup =
                     {
-                        CalculationsGroup =
+                        Children =
                         {
-                            Children =
-                            {
-                                new ProbabilisticPipingCalculationScenario()
-                            }
+                            new ProbabilisticPipingCalculationScenario()
                         }
-                    }, new AssessmentSectionStub());
+                    }
+                };
             }
         }
     }