Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rbba617101367a21a38bf41ad520662058b9012af -r450de34f5b9bea646121b6e101c849f9f78dfc51
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision bba617101367a21a38bf41ad520662058b9012af)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision 450de34f5b9bea646121b6e101c849f9f78dfc51)
@@ -127,6 +127,7 @@
             Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
             Assert.IsNull(calculation.InputParameters.StochasticSoilModel);
             Assert.IsNull(calculation.InputParameters.StochasticSoilProfile);
+            Assert.IsNull(calculation.Output);
         }
 
         [Test]
@@ -361,6 +362,64 @@
             Assert.IsTrue(collector.Contains(stochasticSoilModelEntity));
         }
 
+        [Test]
+        public void Read_EntityWithPipingCalculationOutputEntity_CalculationWithPipingOutput()
+        {
+            // Setup
+            const int outputId = 4578;
+            var entity = new PipingCalculationEntity
+            {
+                EntryPointL = 1m,
+                ExitPointL = 2m,
+                DampingFactorExitMean = 1,
+                SaturatedVolumicWeightOfCoverageLayerMean = 1,
+                Diameter70Mean = 1,
+                DarcyPermeabilityMean = 1
+            };
+            entity.PipingCalculationOutputEntities.Add(new PipingCalculationOutputEntity
+            {
+                PipingCalculationOutputEntityId = outputId
+            });
+
+            var collector = new ReadConversionCollector();
+
+            // Call
+            PipingCalculationScenario calculation = entity.Read(collector, new GeneralPipingInput());
+
+            // Assert
+            Assert.IsNotNull(calculation.Output);
+            Assert.AreEqual(outputId, calculation.Output.StorageId);
+        }
+
+        [Test]
+        public void Read_EntityWithPipingSemiProbabilisticOutputEntity_CalculationWithPipingSemiProbabilisticOutput()
+        {
+            // Setup
+            const int outputId = 675;
+            var entity = new PipingCalculationEntity
+            {
+                EntryPointL = 1m,
+                ExitPointL = 2m,
+                DampingFactorExitMean = 1,
+                SaturatedVolumicWeightOfCoverageLayerMean = 1,
+                Diameter70Mean = 1,
+                DarcyPermeabilityMean = 1
+            };
+            entity.PipingSemiProbabilisticOutputEntities.Add(new PipingSemiProbabilisticOutputEntity
+            {
+                PipingSemiProbabilisticOutputEntityId = outputId
+            });
+
+            var collector = new ReadConversionCollector();
+
+            // Call
+            PipingCalculationScenario calculation = entity.Read(collector, new GeneralPipingInput());
+
+            // Assert
+            Assert.IsNotNull(calculation.SemiProbabilisticOutput);
+            Assert.AreEqual(outputId, calculation.SemiProbabilisticOutput.StorageId);
+        }
+
         private void AssertRoundedDouble(decimal expectedValue, RoundedDouble actualValue)
         {
             Assert.AreEqual(Convert.ToDouble(expectedValue), actualValue, actualValue.GetAccuracy());