Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingCalculationContextTest.cs
===================================================================
diff -u -r7f6453bc0e3e028ad99948c230916ea25d92248a -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingCalculationContextTest.cs	(.../ProbabilisticPipingCalculationContextTest.cs)	(revision 7f6453bc0e3e028ad99948c230916ea25d92248a)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingCalculationContextTest.cs	(.../ProbabilisticPipingCalculationContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
@@ -56,7 +56,7 @@
             {
                 PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel()
             };
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
+            var calculation = new ProbabilisticPipingCalculation();
             var failureMechanism = new PipingFailureMechanism();
             var parent = new CalculationGroup();
 
@@ -96,7 +96,7 @@
             {
                 PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel()
             };
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
+            var calculation = new ProbabilisticPipingCalculation();
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
@@ -115,7 +115,7 @@
             private static readonly MockRepository mocks = new MockRepository();
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
-            private static readonly ProbabilisticPipingCalculation calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
+            private static readonly ProbabilisticPipingCalculation calculation = new ProbabilisticPipingCalculation();
             private static readonly IEnumerable<PipingSurfaceLine> surfaceLines = new PipingSurfaceLine[0];
             private static readonly IEnumerable<PipingStochasticSoilModel> stochasticSoilModels = new PipingStochasticSoilModel[0];
             private static readonly PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
@@ -155,7 +155,7 @@
 
             private static IEnumerable<TestCaseData> GetUnequalTestCases()
             {
-                yield return new TestCaseData(new ProbabilisticPipingCalculationContext(new ProbabilisticPipingCalculation(new GeneralPipingInput()),
+                yield return new TestCaseData(new ProbabilisticPipingCalculationContext(new ProbabilisticPipingCalculation(),
                                                                                         parent,
                                                                                         surfaceLines,
                                                                                         stochasticSoilModels,
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingInputContextTest.cs
===================================================================
diff -u -r7f6453bc0e3e028ad99948c230916ea25d92248a -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingInputContextTest.cs	(.../ProbabilisticPipingInputContextTest.cs)	(revision 7f6453bc0e3e028ad99948c230916ea25d92248a)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingInputContextTest.cs	(.../ProbabilisticPipingInputContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
@@ -44,7 +44,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
+            var calculation = new ProbabilisticPipingCalculation();
             var surfaceLines = new[]
             {
                 new PipingSurfaceLine(string.Empty)
@@ -78,7 +78,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationInput = new ProbabilisticPipingInput(new GeneralPipingInput());
+            var calculationInput = new ProbabilisticPipingInput();
             var surfaceLines = new[]
             {
                 new PipingSurfaceLine(string.Empty)
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs
===================================================================
diff -u -r9cc66c87117c0f5ed9438eb0ec79554cfdba8e80 -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs	(.../ProbabilisticPipingOutputContextTest.cs)	(revision 9cc66c87117c0f5ed9438eb0ec79554cfdba8e80)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs	(.../ProbabilisticPipingOutputContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
@@ -21,7 +21,6 @@
 
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
 
@@ -34,7 +33,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
+            var calculation = new ProbabilisticPipingCalculation();
 
             // Call
             var context = new ProbabilisticPipingOutputContext(calculation);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContextTest.cs
===================================================================
diff -u -r9cc66c87117c0f5ed9438eb0ec79554cfdba8e80 -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContextTest.cs	(.../ProbabilisticPipingProfileSpecificOutputContextTest.cs)	(revision 9cc66c87117c0f5ed9438eb0ec79554cfdba8e80)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContextTest.cs	(.../ProbabilisticPipingProfileSpecificOutputContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
@@ -21,7 +21,6 @@
 
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
 
@@ -34,7 +33,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
+            var calculation = new ProbabilisticPipingCalculation();
 
             // Call
             var context = new ProbabilisticPipingProfileSpecificOutputContext(calculation);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContextTest.cs
===================================================================
diff -u -r9cc66c87117c0f5ed9438eb0ec79554cfdba8e80 -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContextTest.cs	(.../ProbabilisticPipingSectionSpecificOutputContextTest.cs)	(revision 9cc66c87117c0f5ed9438eb0ec79554cfdba8e80)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContextTest.cs	(.../ProbabilisticPipingSectionSpecificOutputContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
@@ -21,7 +21,6 @@
 
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
 
@@ -34,7 +33,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
+            var calculation = new ProbabilisticPipingCalculation();
 
             // Call
             var context = new ProbabilisticPipingSectionSpecificOutputContext(calculation);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTest.cs
===================================================================
diff -u -racf81a7c0b090870e29e5a53a6368832cadb6573 -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTest.cs	(.../SemiProbabilisticPipingCalculationScenarioContextTest.cs)	(revision acf81a7c0b090870e29e5a53a6368832cadb6573)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTest.cs	(.../SemiProbabilisticPipingCalculationScenarioContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
@@ -56,7 +56,7 @@
             {
                 PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel()
             };
-            var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput());
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
             var parent = new CalculationGroup();
 
@@ -96,7 +96,7 @@
             {
                 PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel()
             };
-            var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput());
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
@@ -120,7 +120,7 @@
             private static readonly MockRepository mocks = new MockRepository();
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
-            private static readonly SemiProbabilisticPipingCalculationScenario calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput());
+            private static readonly SemiProbabilisticPipingCalculationScenario calculation = new SemiProbabilisticPipingCalculationScenario();
             private static readonly IEnumerable<PipingSurfaceLine> surfaceLines = new PipingSurfaceLine[0];
             private static readonly IEnumerable<PipingStochasticSoilModel> stochasticSoilModels = new PipingStochasticSoilModel[0];
             private static readonly PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
@@ -160,7 +160,7 @@
 
             private static IEnumerable<TestCaseData> GetUnequalTestCases()
             {
-                yield return new TestCaseData(new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()),
+                yield return new TestCaseData(new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(),
                                                                                                     parent,
                                                                                                     surfaceLines,
                                                                                                     stochasticSoilModels,
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingInputContextTest.cs
===================================================================
diff -u -r8eb7384995560912b2fd268726abe51e7b75bfd8 -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingInputContextTest.cs	(.../SemiProbabilisticPipingInputContextTest.cs)	(revision 8eb7384995560912b2fd268726abe51e7b75bfd8)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingInputContextTest.cs	(.../SemiProbabilisticPipingInputContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
@@ -44,7 +44,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput());
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var surfaceLines = new[]
             {
                 new PipingSurfaceLine(string.Empty)
@@ -78,7 +78,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationInput = new SemiProbabilisticPipingInput(new GeneralPipingInput());
+            var calculationInput = new SemiProbabilisticPipingInput();
             var surfaceLines = new[]
             {
                 new PipingSurfaceLine(string.Empty)