Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs
===================================================================
diff -u -r686466dda6406ee2c7fb1f33faa60494878b1fc8 -r43d53bb7069e25f549a930cb6f8f3898785fad86
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs	(.../PipingSemiProbabilisticDesignVariableFactoryTest.cs)	(revision 686466dda6406ee2c7fb1f33faa60494878b1fc8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs	(.../PipingSemiProbabilisticDesignVariableFactoryTest.cs)	(revision 43d53bb7069e25f549a930cb6f8f3898785fad86)
@@ -58,7 +58,7 @@
 
             // Assert
             Assert.IsInstanceOf<PercentileBasedDesignVariable<LogNormalDistribution>>(thicknessCoverageLayer);
-            DistributionAssert.AreEqual(inputParameters.ThicknessCoverageLayer, thicknessCoverageLayer.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).ThicknessCoverageLayer, thicknessCoverageLayer.Distribution);
             AssertPercentile(0.05, thicknessCoverageLayer);
         }
 
@@ -73,7 +73,7 @@
 
             // Assert
             Assert.IsInstanceOf<DeterministicDesignVariable<LogNormalDistribution>>(thicknessCoverageLayer);
-            DistributionAssert.AreEqual(inputParameters.ThicknessCoverageLayer, thicknessCoverageLayer.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).ThicknessCoverageLayer, thicknessCoverageLayer.Distribution);
             Assert.AreEqual(new RoundedDouble(2), thicknessCoverageLayer.GetDesignValue());
         }
 
@@ -89,7 +89,7 @@
 
             // Assert
             Assert.IsInstanceOf<PercentileBasedDesignVariable<LogNormalDistribution>>(effectiveThicknessCoverageLayer);
-            DistributionAssert.AreEqual(inputParameters.EffectiveThicknessCoverageLayer, effectiveThicknessCoverageLayer.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).EffectiveThicknessCoverageLayer, effectiveThicknessCoverageLayer.Distribution);
             AssertPercentile(0.05, effectiveThicknessCoverageLayer);
         }
 
@@ -105,7 +105,7 @@
 
             // Assert
             Assert.IsInstanceOf<DeterministicDesignVariable<LogNormalDistribution>>(effectiveThicknessCoverageLayer);
-            DistributionAssert.AreEqual(inputParameters.EffectiveThicknessCoverageLayer, effectiveThicknessCoverageLayer.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).EffectiveThicknessCoverageLayer, effectiveThicknessCoverageLayer.Distribution);
             Assert.AreEqual(new RoundedDouble(2), effectiveThicknessCoverageLayer.GetDesignValue());
         }
 
@@ -154,7 +154,7 @@
                 PipingSemiProbabilisticDesignVariableFactory.GetSeepageLength(inputParameters);
 
             // Assert
-            DistributionAssert.AreEqual(inputParameters.SeepageLength, seepageLength.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).SeepageLength, seepageLength.Distribution);
             AssertPercentile(0.05, seepageLength);
         }
 
@@ -169,7 +169,7 @@
                 PipingSemiProbabilisticDesignVariableFactory.GetDiameter70(inputParameters);
 
             // Assert
-            DistributionAssert.AreEqual(inputParameters.Diameter70, d70.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).DiameterD70, d70.Distribution);
             AssertPercentile(0.05, d70);
         }
 
@@ -184,7 +184,7 @@
                 PipingSemiProbabilisticDesignVariableFactory.GetDarcyPermeability(inputParameters);
 
             // Assert
-            DistributionAssert.AreEqual(inputParameters.DarcyPermeability, darcyPermeability.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).DarcyPermeability, darcyPermeability.Distribution);
             AssertPercentile(0.95, darcyPermeability);
         }
 
@@ -203,9 +203,8 @@
                 PipingSemiProbabilisticDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters);
 
             // Assert
-            DistributionAssert.AreEqual(
-                inputParameters.SaturatedVolumicWeightOfCoverageLayer,
-                saturatedVolumicWeightOfCoverageLayer.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).SaturatedVolumicWeightOfCoverageLayer,
+                                        saturatedVolumicWeightOfCoverageLayer.Distribution);
             AssertPercentile(0.05, saturatedVolumicWeightOfCoverageLayer);
         }
 
@@ -221,7 +220,8 @@
 
             // Assert
             Assert.IsInstanceOf<DeterministicDesignVariable<LogNormalDistribution>>(saturatedVolumicWeightOfCoverageLayer);
-            DistributionAssert.AreEqual(inputParameters.SaturatedVolumicWeightOfCoverageLayer, saturatedVolumicWeightOfCoverageLayer.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).SaturatedVolumicWeightOfCoverageLayer,
+                                        saturatedVolumicWeightOfCoverageLayer.Distribution);
             Assert.AreEqual(new RoundedDouble(2), saturatedVolumicWeightOfCoverageLayer.GetDesignValue());
         }
 
@@ -236,7 +236,7 @@
                 PipingSemiProbabilisticDesignVariableFactory.GetThicknessAquiferLayer(inputParameters);
 
             // Assert
-            DistributionAssert.AreEqual(inputParameters.ThicknessAquiferLayer, thicknessAquiferLayer.Distribution);
+            DistributionAssert.AreEqual(new DerivedPipingInput(inputParameters).ThicknessAquiferLayer, thicknessAquiferLayer.Distribution);
             AssertPercentile(0.95, thicknessAquiferLayer);
         }