Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r22bff0d2c96822e98da42382cd1c08128d275998 -r02937f67556a7b1d52477b196c62ed50df1cae6d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision 22bff0d2c96822e98da42382cd1c08128d275998)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision 02937f67556a7b1d52477b196c62ed50df1cae6d)
@@ -69,8 +69,8 @@
                 ScenarioContribution = Convert.ToDecimal(contribution),
                 Name = name,
                 Comments = comments,
-                EntryPointL = ToNullableDecimal(entryPoint),
-                ExitPointL = ToNullableDecimal(exitPoint),
+                EntryPointL = entryPoint.ToNullableDecimal(),
+                ExitPointL = exitPoint.ToNullableDecimal(),
                 PhreaticLevelExitMean = GetRandomDecimalInRange(random, -9999.99, 9999.99),
                 PhreaticLevelExitStandardDeviation = GetRandomDecimalInRange(random, 0, 9999.99),
                 DampingFactorExitMean = GetRandomDecimalInRange(random, 1e-6, 9999.99),
@@ -128,6 +128,7 @@
             Assert.IsNull(calculation.InputParameters.StochasticSoilModel);
             Assert.IsNull(calculation.InputParameters.StochasticSoilProfile);
             Assert.IsNull(calculation.Output);
+            Assert.IsNull(calculation.SemiProbabilisticOutput);
         }
 
         [Test]
@@ -373,12 +374,12 @@
                 DampingFactorExitMean = 1,
                 SaturatedVolumicWeightOfCoverageLayerMean = 1,
                 Diameter70Mean = 1,
-                DarcyPermeabilityMean = 1
+                DarcyPermeabilityMean = 1,
+                PipingCalculationOutputEntity = new PipingCalculationOutputEntity
+                {
+                    PipingCalculationOutputEntityId = outputId
+                }
             };
-            entity.PipingCalculationOutputEntities.Add(new PipingCalculationOutputEntity
-            {
-                PipingCalculationOutputEntityId = outputId
-            });
 
             var collector = new ReadConversionCollector();
 
@@ -402,12 +403,12 @@
                 DampingFactorExitMean = 1,
                 SaturatedVolumicWeightOfCoverageLayerMean = 1,
                 Diameter70Mean = 1,
-                DarcyPermeabilityMean = 1
+                DarcyPermeabilityMean = 1,
+                PipingSemiProbabilisticOutputEntity = new PipingSemiProbabilisticOutputEntity
+                {
+                    PipingSemiProbabilisticOutputEntityId = outputId
+                }
             };
-            entity.PipingSemiProbabilisticOutputEntities.Add(new PipingSemiProbabilisticOutputEntity
-            {
-                PipingSemiProbabilisticOutputEntityId = outputId
-            });
 
             var collector = new ReadConversionCollector();
 
@@ -429,15 +430,6 @@
             Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy());
         }
 
-        private static decimal? ToNullableDecimal(double entryPoint)
-        {
-            if (double.IsNaN(entryPoint))
-            {
-                return null;
-            }
-            return Convert.ToDecimal(entryPoint);
-        }
-
         private static decimal GetRandomDecimalInRange(Random random, double lowerLimit, double upperLimit)
         {
             var difference = upperLimit - lowerLimit;