Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r450de34f5b9bea646121b6e101c849f9f78dfc51 -r02937f67556a7b1d52477b196c62ed50df1cae6d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision 450de34f5b9bea646121b6e101c849f9f78dfc51)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision 02937f67556a7b1d52477b196c62ed50df1cae6d)
@@ -114,8 +114,8 @@
             Assert.AreEqual(name, entity.Name);
             Assert.AreEqual(comments, entity.Comments);
 
-            Assert.AreEqual(GetExpectedValueForNullableDecimal(exitPoint), entity.ExitPointL);
-            Assert.AreEqual(GetExpectedValueForNullableDecimal(entryPoint), entity.EntryPointL);
+            Assert.AreEqual(exitPoint.ToNullableDecimal(), entity.ExitPointL);
+            Assert.AreEqual(entryPoint.ToNullableDecimal(), entity.EntryPointL);
 
             PipingInput input = calculation.InputParameters;
             Assert.AreEqual(Convert.ToDecimal(input.PhreaticLevelExit.Mean),
@@ -342,7 +342,7 @@
             PipingCalculationEntity entity = calculation.Create(registry, 0);
 
             // Assert
-            Assert.AreEqual(1, entity.PipingCalculationOutputEntities.Count);
+            Assert.IsNotNull(entity.PipingCalculationOutputEntity);
         }
 
         [Test]
@@ -365,19 +365,9 @@
             PipingCalculationEntity entity = calculation.Create(registry, 0);
 
             // Assert
-            Assert.AreEqual(1, entity.PipingSemiProbabilisticOutputEntities.Count);
+            Assert.IsNotNull(entity.PipingSemiProbabilisticOutputEntity);
         }
 
-        private static decimal? GetExpectedValueForNullableDecimal(double valueThatCanBeNaN)
-        {
-            decimal? expectedExitPoint = null;
-            if (!double.IsNaN(valueThatCanBeNaN))
-            {
-                expectedExitPoint = Convert.ToDecimal(valueThatCanBeNaN);
-            }
-            return expectedExitPoint;
-        }
-
         private double GetRandomDoubleFromRange(Random random, double lowerLimit, double upperLimit)
         {
             double difference = upperLimit - lowerLimit;