Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -rc601c50e07f4c8fcd6d1156cd046d04a521e5c42 -r9a504957bcb80f9343d6926db44c8d74cfa9aa07
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision c601c50e07f4c8fcd6d1156cd046d04a521e5c42)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 9a504957bcb80f9343d6926db44c8d74cfa9aa07)
@@ -773,9 +773,9 @@
         private static void AddProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection,
                                                                       HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            ProbabilisticPipingCalculationScenario pipingCalculationScenario =
-                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
-            assessmentSection.Piping.CalculationsGroup.Children.Add(pipingCalculationScenario);
+            assessmentSection.Piping.CalculationsGroup.Children.Add(
+                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                    hydraulicBoundaryLocation));
         }
 
         private static void AddMacroStabilityInwardsCalculationScenario(AssessmentSection assessmentSection,
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc601c50e07f4c8fcd6d1156cd046d04a521e5c42 -r9a504957bcb80f9343d6926db44c8d74cfa9aa07
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision c601c50e07f4c8fcd6d1156cd046d04a521e5c42)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9a504957bcb80f9343d6926db44c8d74cfa9aa07)
@@ -1136,13 +1136,15 @@
                     hydraulicBoundaryLocation
                 }, true);
 
-                SemiProbabilisticPipingCalculationScenario validSemiProbabilisticCalculation =
-                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
-                SemiProbabilisticPipingCalculationScenario invalidSemiProbabilisticCalculation =
+                var validSemiProbabilisticCalculation =
+                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var invalidSemiProbabilisticCalculation =
                     SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput<SemiProbabilisticPipingCalculationScenario>();
-                ProbabilisticPipingCalculationScenario validProbabilisticCalculation =
-                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
-                ProbabilisticPipingCalculationScenario invalidProbabilisticCalculation =
+                var validProbabilisticCalculation =
+                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var invalidProbabilisticCalculation =
                     ProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput<ProbabilisticPipingCalculationScenario>();
 
                 var childGroup = new CalculationGroup();
@@ -1262,17 +1264,22 @@
                     hydraulicBoundaryLocation
                 }, true);
 
-                SemiProbabilisticPipingCalculationScenario calculationA =
-                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
+                var calculationA =
+                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var calculationB =
+                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var calculationC =
+                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var calculationD =
+                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+
                 calculationA.Name = "A";
-                SemiProbabilisticPipingCalculationScenario calculationB =
-                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
                 calculationB.Name = "B";
-                ProbabilisticPipingCalculationScenario calculationC =
-                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
                 calculationC.Name = "C";
-                ProbabilisticPipingCalculationScenario calculationD =
-                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
                 calculationD.Name = "D";
 
                 var childGroup = new CalculationGroup();
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc601c50e07f4c8fcd6d1156cd046d04a521e5c42 -r9a504957bcb80f9343d6926db44c8d74cfa9aa07
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision c601c50e07f4c8fcd6d1156cd046d04a521e5c42)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 9a504957bcb80f9343d6926db44c8d74cfa9aa07)
@@ -616,13 +616,15 @@
                     hydraulicBoundaryLocation
                 }, true);
 
-                SemiProbabilisticPipingCalculationScenario validSemiProbabilisticCalculation =
-                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
-                SemiProbabilisticPipingCalculationScenario invalidSemiProbabilisticCalculation =
+                var validSemiProbabilisticCalculation =
+                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var invalidSemiProbabilisticCalculation =
                     SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput<SemiProbabilisticPipingCalculationScenario>();
-                ProbabilisticPipingCalculationScenario validProbabilisticCalculation =
-                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
-                ProbabilisticPipingCalculationScenario invalidProbabilisticCalculation =
+                var validProbabilisticCalculation =
+                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var invalidProbabilisticCalculation =
                     ProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput<ProbabilisticPipingCalculationScenario>();
 
                 failureMechanism.CalculationsGroup.Children.Add(validSemiProbabilisticCalculation);
@@ -713,17 +715,22 @@
                     hydraulicBoundaryLocation
                 }, true);
 
-                SemiProbabilisticPipingCalculationScenario calculationA =
-                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
+                var calculationA =
+                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var calculationB =
+                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var calculationC =
+                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+                var calculationD =
+                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                        hydraulicBoundaryLocation);
+
                 calculationA.Name = "A";
-                SemiProbabilisticPipingCalculationScenario calculationB =
-                    SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
                 calculationB.Name = "B";
-                ProbabilisticPipingCalculationScenario calculationC =
-                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
                 calculationC.Name = "C";
-                ProbabilisticPipingCalculationScenario calculationD =
-                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
                 calculationD.Name = "D";
 
                 failureMechanism.CalculationsGroup.Children.Add(calculationA);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc601c50e07f4c8fcd6d1156cd046d04a521e5c42 -r9a504957bcb80f9343d6926db44c8d74cfa9aa07
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision c601c50e07f4c8fcd6d1156cd046d04a521e5c42)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 9a504957bcb80f9343d6926db44c8d74cfa9aa07)
@@ -858,8 +858,8 @@
                     hydraulicBoundaryLocation
                 }, true);
 
-                ProbabilisticPipingCalculationScenario calculation =
-                    ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(hydraulicBoundaryLocation);
+                var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<ProbabilisticPipingCalculationScenario>(
+                    hydraulicBoundaryLocation);
 
                 var pipingCalculationScenarioContext = new ProbabilisticPipingCalculationScenarioContext(calculation,
                                                                                                          new CalculationGroup(),
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs
===================================================================
diff -u -r86893fbc492454548ce2ecdb5876c46bd568c74e -r9a504957bcb80f9343d6926db44c8d74cfa9aa07
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 86893fbc492454548ce2ecdb5876c46bd568c74e)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 9a504957bcb80f9343d6926db44c8d74cfa9aa07)
@@ -111,14 +111,18 @@
             HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1);
             hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble());
 
-            SemiProbabilisticPipingCalculation calculation1 =
-                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(hydraulicBoundaryLocation1);
-            ProbabilisticPipingCalculation calculation2 =
-                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(hydraulicBoundaryLocation1);
-            SemiProbabilisticPipingCalculation calculation3 =
-                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(hydraulicBoundaryLocation2);
-            ProbabilisticPipingCalculation calculation4 =
-                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(hydraulicBoundaryLocation2);
+            var calculation1 =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation1);
+            var calculation2 =
+                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation1);
+            var calculation3 =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation2);
+            var calculation4 =
+                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation2);
 
             failureMechanism.CalculationsGroup.Children.AddRange(new IPipingCalculation<PipingInput>[]
             {
@@ -244,14 +248,18 @@
             HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1);
             hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble());
 
-            SemiProbabilisticPipingCalculation calculation1 =
-                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(hydraulicBoundaryLocation1);
-            ProbabilisticPipingCalculation calculation2 =
-                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(hydraulicBoundaryLocation1);
-            SemiProbabilisticPipingCalculation calculation3 =
-                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(hydraulicBoundaryLocation2);
-            ProbabilisticPipingCalculation calculation4 =
-                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(hydraulicBoundaryLocation2);
+            var calculation1 =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation1);
+            var calculation2 =
+                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation1);
+            var calculation3 =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestSemiProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation2);
+            var calculation4 =
+                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(
+                    hydraulicBoundaryLocation2);
 
             var calculationGroup = new CalculationGroup
             {
@@ -445,8 +453,8 @@
             assessmentSection.HydraulicBoundaryDatabase.FilePath = validHydraulicBoundaryDatabaseFilePath;
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
 
-            ProbabilisticPipingCalculation calculation =
-                ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(hydraulicBoundaryLocation);
+            var calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(
+                hydraulicBoundaryLocation);
 
             // Call
             CalculatableActivity activity = PipingCalculationActivityFactory.CreateProbabilisticPipingCalculationActivity(calculation,