Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs
===================================================================
diff -u -r056ec6550e1d52df910214f78c3da086f07c5305 -r4a78e472a7c2a092f8626e57bf600100944fdf8b
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision 056ec6550e1d52df910214f78c3da086f07c5305)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision 4a78e472a7c2a092f8626e57bf600100944fdf8b)
@@ -96,7 +96,7 @@
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
             // Call
-            ShowMacroStabilityInwardsScenarioView(new CalculationGroup(), new MacroStabilityInwardsFailureMechanism());
+            ShowMacroStabilityInwardsScenariosView(new MacroStabilityInwardsFailureMechanism());
 
             // Assert
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -111,7 +111,7 @@
         public void MacroStabilityInwardsScenarioView_CalculationsWithAllDataSet_DataGridViewCorrectlyInitialized()
         {
             // Call
-            ShowFullyConfiguredMacroStabilityInwardsScenarioView();
+            ShowFullyConfiguredMacroStabilityInwardsScenariosView();
 
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -134,7 +134,7 @@
             Assert.AreEqual(ProbabilityFormattingHelper.Format(1), cells[failureProbabilityColumnIndex].FormattedValue);
         }
 
-        private void ShowFullyConfiguredMacroStabilityInwardsScenarioView()
+        private void ShowFullyConfiguredMacroStabilityInwardsScenariosView()
         {
             var surfaceLine1 = new MacroStabilityInwardsSurfaceLine("Surface line 1")
             {
@@ -176,39 +176,36 @@
                 })
             });
 
-            var calculationGroup = new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.AddRange(new[]
             {
-                Children =
+                new MacroStabilityInwardsCalculationScenario
                 {
-                    new MacroStabilityInwardsCalculationScenario
+                    Name = "Calculation 1",
+                    InputParameters =
                     {
-                        Name = "Calculation 1",
-                        InputParameters =
-                        {
-                            SurfaceLine = surfaceLine1
-                        }
+                        SurfaceLine = surfaceLine1
+                    }
+                },
+                new MacroStabilityInwardsCalculationScenario
+                {
+                    Name = "Calculation 2",
+                    InputParameters =
+                    {
+                        SurfaceLine = surfaceLine2
                     },
-                    new MacroStabilityInwardsCalculationScenario
+                    Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties
                     {
-                        Name = "Calculation 2",
-                        InputParameters =
-                        {
-                            SurfaceLine = surfaceLine2
-                        },
-                        Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties
-                        {
-                            FactorOfStability = 0.2
-                        })
-                    }
+                        FactorOfStability = 0.2
+                    })
                 }
-            };
+            });
 
-            ShowMacroStabilityInwardsScenarioView(calculationGroup, failureMechanism);
+            ShowMacroStabilityInwardsScenariosView(failureMechanism);
         }
 
-        private void ShowMacroStabilityInwardsScenarioView(CalculationGroup calculationGroup, MacroStabilityInwardsFailureMechanism failureMechanism)
+        private void ShowMacroStabilityInwardsScenariosView(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
-            var scenarioView = new MacroStabilityInwardsScenariosView(calculationGroup, failureMechanism, new AssessmentSectionStub());
+            var scenarioView = new MacroStabilityInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism, new AssessmentSectionStub());
 
             testForm.Controls.Add(scenarioView);
             testForm.Show();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -r056ec6550e1d52df910214f78c3da086f07c5305 -r4a78e472a7c2a092f8626e57bf600100944fdf8b
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision 056ec6550e1d52df910214f78c3da086f07c5305)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision 4a78e472a7c2a092f8626e57bf600100944fdf8b)
@@ -100,7 +100,7 @@
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
             // Call
-            ShowPipingScenarioView(new CalculationGroup(), new PipingFailureMechanism());
+            ShowPipingScenariosView(new PipingFailureMechanism());
             
             // Assert
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -118,7 +118,7 @@
         public void PipingScenarioView_CalculationsWithAllDataSet_DataGridViewCorrectlyInitialized()
         {
             // Call
-            ShowFullyConfiguredPipingScenarioView();
+            ShowFullyConfiguredPipingScenariosView();
 
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -147,7 +147,7 @@
             Assert.AreEqual(ProbabilityFormattingHelper.Format(0.027777778), cells[failureProbabilitySellmeijerColumnIndex].FormattedValue);
         }
 
-        private void ShowFullyConfiguredPipingScenarioView()
+        private void ShowFullyConfiguredPipingScenariosView()
         {
             var surfaceLine1 = new PipingSurfaceLine("Surface line 1")
             {
@@ -189,56 +189,53 @@
                 })
             });
 
-            var calculationGroup = new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.AddRange(new[]
             {
-                Children =
+                new PipingCalculationScenario(new GeneralPipingInput())
                 {
-                    new PipingCalculationScenario(new GeneralPipingInput())
+                    Name = "Calculation 1",
+                    InputParameters =
                     {
-                        Name = "Calculation 1",
-                        InputParameters =
+                        SurfaceLine = surfaceLine1,
+                        DampingFactorExit =
                         {
-                            SurfaceLine = surfaceLine1,
-                            DampingFactorExit =
-                            {
-                                Mean = (RoundedDouble) 1.1111
-                            },
-                            PhreaticLevelExit =
-                            {
-                                Mean = (RoundedDouble) 2.2222
-                            },
-                            EntryPointL = (RoundedDouble) 3.3333,
-                            ExitPointL = (RoundedDouble) 4.4444
-                        }
-                    },
-                    new PipingCalculationScenario(new GeneralPipingInput())
-                    {
-                        Name = "Calculation 2",
-                        InputParameters =
+                            Mean = (RoundedDouble) 1.1111
+                        },
+                        PhreaticLevelExit =
                         {
-                            SurfaceLine = surfaceLine2,
-                            DampingFactorExit =
-                            {
-                                Mean = (RoundedDouble) 5.5555
-                            },
-                            PhreaticLevelExit =
-                            {
-                                Mean = (RoundedDouble) 6.6666
-                            },
-                            EntryPointL = (RoundedDouble) 7.7777,
-                            ExitPointL = (RoundedDouble) 8.8888
+                            Mean = (RoundedDouble) 2.2222
                         },
-                        Output = PipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024)
+                        EntryPointL = (RoundedDouble) 3.3333,
+                        ExitPointL = (RoundedDouble) 4.4444
                     }
+                },
+                new PipingCalculationScenario(new GeneralPipingInput())
+                {
+                    Name = "Calculation 2",
+                    InputParameters =
+                    {
+                        SurfaceLine = surfaceLine2,
+                        DampingFactorExit =
+                        {
+                            Mean = (RoundedDouble) 5.5555
+                        },
+                        PhreaticLevelExit =
+                        {
+                            Mean = (RoundedDouble) 6.6666
+                        },
+                        EntryPointL = (RoundedDouble) 7.7777,
+                        ExitPointL = (RoundedDouble) 8.8888
+                    },
+                    Output = PipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024)
                 }
-            };
+            });
 
-            ShowPipingScenarioView(calculationGroup, failureMechanism);
+            ShowPipingScenariosView(failureMechanism);
         }
 
-        private void ShowPipingScenarioView(CalculationGroup calculationGroup, PipingFailureMechanism failureMechanism)
+        private void ShowPipingScenariosView(PipingFailureMechanism failureMechanism)
         {
-            var pipingScenarioView = new PipingScenariosView(calculationGroup, failureMechanism, new AssessmentSectionStub());
+            var pipingScenarioView = new PipingScenariosView(failureMechanism.CalculationsGroup, failureMechanism, new AssessmentSectionStub());
 
             testForm.Controls.Add(pipingScenarioView);
             testForm.Show();