Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PipingSurfaceLineSelectionDialog.cs
===================================================================
diff -u -r5d9eed7d6486a2a94a1f2b2480ea08b2a7cc7011 -r1e9d4a58c992e7d8a63330674c9807a68c6c33a9
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PipingSurfaceLineSelectionDialog.cs	(.../PipingSurfaceLineSelectionDialog.cs)	(revision 5d9eed7d6486a2a94a1f2b2480ea08b2a7cc7011)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PipingSurfaceLineSelectionDialog.cs	(.../PipingSurfaceLineSelectionDialog.cs)	(revision 1e9d4a58c992e7d8a63330674c9807a68c6c33a9)
@@ -78,7 +78,7 @@
         /// Gets an indicator whether to generate semi-probabilistic calculation scenario's.
         /// </summary>
         public bool GenerateSemiProbabilistic { get; private set; }
-        
+
         /// <summary>
         /// Gets an indicator whether to generate probabilistic calculation scenario's.
         /// </summary>
@@ -163,7 +163,7 @@
         {
             Close();
         }
-        
+
         private void SemiProbabilisticCheckbox_CheckedChanged(object sender, EventArgs e)
         {
             GenerateSemiProbabilistic = SemiProbabilisticCheckBox.Checked;
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs
===================================================================
diff -u -r5d9eed7d6486a2a94a1f2b2480ea08b2a7cc7011 -r1e9d4a58c992e7d8a63330674c9807a68c6c33a9
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs	(.../PipingSurfaceLineSelectionDialogTest.cs)	(revision 5d9eed7d6486a2a94a1f2b2480ea08b2a7cc7011)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs	(.../PipingSurfaceLineSelectionDialogTest.cs)	(revision 1e9d4a58c992e7d8a63330674c9807a68c6c33a9)
@@ -39,6 +39,26 @@
 
         private Form testForm;
 
+        private static IEnumerable<TestCaseData> GetCheckBoxes
+        {
+            get
+            {
+                yield return new TestCaseData(new List<Func<PipingSurfaceLineSelectionDialog, CheckBoxTester>>
+                {
+                    dialog => new CheckBoxTester("SemiProbabilisticCheckBox", dialog)
+                });
+                yield return new TestCaseData(new List<Func<PipingSurfaceLineSelectionDialog, CheckBoxTester>>
+                {
+                    dialog => new CheckBoxTester("ProbabilisticCheckBox", dialog)
+                });
+                yield return new TestCaseData(new List<Func<PipingSurfaceLineSelectionDialog, CheckBoxTester>>
+                {
+                    dialog => new CheckBoxTester("SemiProbabilisticCheckBox", dialog),
+                    dialog => new CheckBoxTester("ProbabilisticCheckBox", dialog)
+                });
+            }
+        }
+
         [SetUp]
         public void Setup()
         {
@@ -409,7 +429,7 @@
             using (var dialog = new PipingSurfaceLineSelectionDialog(testForm, Enumerable.Empty<PipingSurfaceLine>()))
             {
                 dialog.Show();
-                
+
                 // When
                 var semiProbabilisticCheckBox = new CheckBoxTester("SemiProbabilisticCheckBox", dialog);
                 if (checkBoxChecked)
@@ -420,7 +440,7 @@
                 {
                     semiProbabilisticCheckBox.UnCheck();
                 }
-                
+
                 // Then
                 Assert.AreEqual(checkBoxChecked, dialog.GenerateSemiProbabilistic);
             }
@@ -435,7 +455,7 @@
             using (var dialog = new PipingSurfaceLineSelectionDialog(testForm, Enumerable.Empty<PipingSurfaceLine>()))
             {
                 dialog.Show();
-                
+
                 // When
                 var probabilisticCheckBox = new CheckBoxTester("ProbabilisticCheckBox", dialog);
                 if (checkBoxChecked)
@@ -446,30 +466,10 @@
                 {
                     probabilisticCheckBox.UnCheck();
                 }
-                
+
                 // Then
                 Assert.AreEqual(checkBoxChecked, dialog.GenerateProbabilistic);
             }
         }
-
-        private static IEnumerable<TestCaseData> GetCheckBoxes
-        {
-            get
-            {
-                yield return new TestCaseData(new List<Func<PipingSurfaceLineSelectionDialog, CheckBoxTester>>
-                {
-                    dialog => new CheckBoxTester("SemiProbabilisticCheckBox", dialog)
-                });
-                yield return new TestCaseData(new List<Func<PipingSurfaceLineSelectionDialog, CheckBoxTester>>
-                {
-                    dialog => new CheckBoxTester("ProbabilisticCheckBox", dialog)
-                });
-                yield return new TestCaseData(new List<Func<PipingSurfaceLineSelectionDialog, CheckBoxTester>>
-                {
-                    dialog => new CheckBoxTester("SemiProbabilisticCheckBox", dialog),
-                    dialog => new CheckBoxTester("ProbabilisticCheckBox", dialog)
-                });
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs
===================================================================
diff -u -rf8fcd3371461f6a1fa17e548f0a1e491b4b61043 -r1e9d4a58c992e7d8a63330674c9807a68c6c33a9
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs	(.../HeaveCalculatorStub.cs)	(revision f8fcd3371461f6a1fa17e548f0a1e491b4b61043)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs	(.../HeaveCalculatorStub.cs)	(revision 1e9d4a58c992e7d8a63330674c9807a68c6c33a9)
@@ -45,9 +45,9 @@
         public double PhiExit { get; private set; }
         public double PhiPolder { get; private set; }
         public double RExit { get; private set; }
+        public double Zh { get; private set; }
 
         public double Gradient { get; private set; }
-        public double Zh { get; private set; }
         public double FoSh { get; private set; }
 
         public void SetDTotal(double dTotal)
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs
===================================================================
diff -u -r845fd279735c2917659ea5e03a4b6da3e5afd92d -r1e9d4a58c992e7d8a63330674c9807a68c6c33a9
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs	(.../UpliftCalculatorStub.cs)	(revision 845fd279735c2917659ea5e03a4b6da3e5afd92d)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs	(.../UpliftCalculatorStub.cs)	(revision 1e9d4a58c992e7d8a63330674c9807a68c6c33a9)
@@ -53,9 +53,9 @@
         public double PhiPolder { get; private set; }
         public double RExit { get; private set; }
         public double VolumetricWeightOfWater { get; private set; }
+        public double Zu { get; private set; }
 
         public double EffectiveStress { get; set; }
-        public double Zu { get; private set; }
         public double FoSu { get; private set; }
 
         public void SetHExit(double hExit)