Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs
===================================================================
diff -u -r0dfaf04c32ddd8f2ccfe1e244bdc6efcbb3b6857 -rd7ac6da9fa00d17a03d6912000c889172bbf12ad
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs	(.../PipingSemiProbabilisticCalculationServiceTest.cs)	(revision 0dfaf04c32ddd8f2ccfe1e244bdc6efcbb3b6857)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs	(.../PipingSemiProbabilisticCalculationServiceTest.cs)	(revision d7ac6da9fa00d17a03d6912000c889172bbf12ad)
@@ -39,7 +39,10 @@
         public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double factorOfSafety, double expectedResult)
         {
             // Setup
-            var calculatorResult = new PipingOutput(double.NaN, factorOfSafety, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN);
+            var calculatorResult = new PipingOutput(new PipingOutput.ConstructionProperties
+            {
+                UpliftFactorOfSafety = factorOfSafety
+            });
             var calculation = AsPipingCalculation(calculatorResult);
             double norm = 1.0/returnPeriod;
 
@@ -60,7 +63,10 @@
         public void HeaveProbability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double factorOfSafety, double expectedResult)
         {
             // Setup
-            var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, factorOfSafety, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN);
+            var calculatorResult = new PipingOutput(new PipingOutput.ConstructionProperties
+            {
+                HeaveFactorOfSafety = factorOfSafety
+            });
             var calculation = AsPipingCalculation(calculatorResult);
             double norm = 1.0/returnPeriod;
 
@@ -81,7 +87,10 @@
         public void SellmeijerProbability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double factorOfSafety, double expectedResult)
         {
             // Setup
-            var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, factorOfSafety, double.NaN, double.NaN, double.NaN, double.NaN);
+            var calculatorResult = new PipingOutput(new PipingOutput.ConstructionProperties
+            {
+                SellmeijerFactorOfSafety = factorOfSafety
+            });
             var calculation = AsPipingCalculation(calculatorResult);
             double norm = 1.0/returnPeriod;
 
@@ -104,7 +113,12 @@
         public void PipingReliability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double fosUplift, double fosHeave, double fosSellmeijer, double expectedResult)
         {
             // Setup
-            var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer, double.NaN, double.NaN, double.NaN, double.NaN);
+            var calculatorResult = new PipingOutput(new PipingOutput.ConstructionProperties
+            {
+                UpliftFactorOfSafety = fosUplift,
+                HeaveFactorOfSafety = fosHeave,
+                SellmeijerFactorOfSafety = fosSellmeijer
+            });
             var calculation = AsPipingCalculation(calculatorResult);
             double norm = 1.0/returnPeriod;
 
@@ -124,7 +138,7 @@
         public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double assessmentSectionLength, double contribution, double expectedResult)
         {
             // Setup
-            var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN);
+            var calculatorResult = new PipingOutput(new PipingOutput.ConstructionProperties());
             var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput
             {
                 SectionLength = assessmentSectionLength
@@ -153,7 +167,13 @@
             const double fosSellmeijer = 0.9;
             const double expectedResult = 0.907;
 
-            var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer, double.NaN, double.NaN, double.NaN, double.NaN);
+            var calculatorResult = new PipingOutput(new PipingOutput.ConstructionProperties
+            {
+                UpliftFactorOfSafety = fosUplift,
+                HeaveFactorOfSafety = fosHeave,
+                SellmeijerFactorOfSafety = fosSellmeijer
+
+            });
             var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput
             {
                 SectionLength = assessmentSectionLength
@@ -181,7 +201,13 @@
             [Values(0.9, 1.1)] double fosSellmeijer)
         {
             // Setup
-            var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer, double.NaN, double.NaN, double.NaN, double.NaN);
+            var calculatorResult = new PipingOutput(new PipingOutput.ConstructionProperties
+            {
+                UpliftFactorOfSafety = fosUplift,
+                HeaveFactorOfSafety = fosHeave,
+                SellmeijerFactorOfSafety = fosSellmeijer
+
+            });
             var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput
             {
                 SectionLength = assessmentSectionLength