Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -39,6 +39,7 @@
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.Views;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 
 namespace Ringtoets.Integration.Forms.Test
@@ -85,7 +86,8 @@
             var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             var pipingCalculation = new PipingCalculation(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             var emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
             var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation
@@ -157,6 +159,7 @@
                 Assert.AreEqual(designWaterLevel, grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel, grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
 
                 Assert.IsNotNull(pipingCalculation.Output);
+                Assert.IsNotNull(pipingCalculation.SemiProbabilisticOutput);
                 Assert.IsNotNull(grassCoverErosionInwardsCalculation.Output);
                 Assert.IsNotNull(heightStructuresCalculation.Output);
 
@@ -176,6 +179,7 @@
                 Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeight);
                 Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel);
                 Assert.IsNull(pipingCalculation.Output);
+                Assert.IsNull(pipingCalculation.SemiProbabilisticOutput);
                 Assert.IsNull(grassCoverErosionInwardsCalculation.Output);
                 Assert.IsNull(heightStructuresCalculation.Output);
             }
@@ -276,7 +280,8 @@
             PipingCalculation emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             PipingCalculation pipingCalculation = new PipingCalculation(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             GrassCoverErosionInwardsCalculation emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
             GrassCoverErosionInwardsCalculation grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation
@@ -332,6 +337,7 @@
                 // Precondition
                 Assert.AreEqual(failureMechanismContribution.Norm.ToString(), normTester.Text);
                 Assert.IsNotNull(pipingCalculation.Output);
+                Assert.IsNotNull(pipingCalculation.SemiProbabilisticOutput);
                 Assert.IsNotNull(grassCoverErosionInwardsCalculation.Output);
                 Assert.IsNotNull(heightStructuresCalculation.Output);
 
@@ -345,6 +351,7 @@
 
                 Assert.AreEqual(normValue, failureMechanismContribution.Norm);
                 Assert.IsNull(pipingCalculation.Output);
+                Assert.IsNull(pipingCalculation.SemiProbabilisticOutput);
                 Assert.IsNull(grassCoverErosionInwardsCalculation.Output);
                 Assert.IsNull(heightStructuresCalculation.Output);
             }
@@ -363,7 +370,8 @@
             PipingCalculation emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             PipingCalculation pipingCalculation = new PipingCalculation(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             GrassCoverErosionInwardsCalculation emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
             GrassCoverErosionInwardsCalculation grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation
@@ -417,6 +425,7 @@
                 // Precondition
                 Assert.AreEqual(failureMechanismContribution.Norm.ToString(), normTester.Text);
                 Assert.IsNotNull(pipingCalculation.Output);
+                Assert.IsNotNull(pipingCalculation.SemiProbabilisticOutput);
                 Assert.IsNotNull(grassCoverErosionInwardsCalculation.Output);
                 Assert.IsNotNull(heightStructuresCalculation.Output);
 
@@ -430,6 +439,7 @@
 
                 Assert.AreEqual(normValue, failureMechanismContribution.Norm);
                 Assert.IsNull(pipingCalculation.Output);
+                Assert.IsNull(pipingCalculation.SemiProbabilisticOutput);
                 Assert.IsNull(grassCoverErosionInwardsCalculation.Output);
                 Assert.IsNull(heightStructuresCalculation.Output);
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -201,6 +201,10 @@
       <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
       <Name>Ringtoets.HydraRing.Calculation.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Piping\test\Ringtoets.Piping.Data.TestUtil\Ringtoets.Piping.Data.TestUtil.csproj">
+      <Project>{955E574D-67CE-4347-AA6B-7DF8A04ED754}</Project>
+      <Name>Ringtoets.Piping.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87C2C553-C0BC-40BF-B1EA-B83BFF357F27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 64eede81657b51fb755944fd3939ceefb839e591)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -42,6 +42,8 @@
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Plugin;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
+using Ringtoets.Piping.KernelWrapper.TestUtil;
 using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -511,14 +513,16 @@
 
             HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection);
 
-            PipingOutput pipingOutput = new PipingOutput(3.0, 4.0, 1.0, 3.0, 0.2, 0.4);
-            PipingCalculation pipingCalculation = new PipingCalculation(new GeneralPipingInput())
+            var pipingOutput = new TestPipingOutput();
+            var pipingSemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput();
+            var pipingCalculation = new PipingCalculation(new GeneralPipingInput())
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First()
                 },
-                Output = pipingOutput
+                Output = pipingOutput,
+                SemiProbabilisticOutput = pipingSemiProbabilisticOutput
             };
 
             assessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Add(pipingCalculation);
@@ -565,6 +569,7 @@
                     CollectionAssert.AreEqual(currentLocations, assessmentSection.HydraulicBoundaryDatabase.Locations);
                     Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations.First(), pipingCalculation.InputParameters.HydraulicBoundaryLocation);
                     Assert.AreSame(pipingOutput, pipingCalculation.Output);
+                    Assert.AreSame(pipingSemiProbabilisticOutput, pipingCalculation.SemiProbabilisticOutput);
                     Assert.AreSame(currentFirstGrassCoverErosionOutwardsLocation, assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.First());
                 }
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj
===================================================================
diff -u -r78532d8087d842a4658db8130641ad8fe6c548e6 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj	(.../Ringtoets.Integration.Service.Test.csproj)	(revision 78532d8087d842a4658db8130641ad8fe6c548e6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj	(.../Ringtoets.Integration.Service.Test.csproj)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -102,6 +102,10 @@
       <Project>{CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB}</Project>
       <Name>Ringtoets.Piping.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Piping\test\Ringtoets.Piping.Data.TestUtil\Ringtoets.Piping.Data.TestUtil.csproj">
+      <Project>{955E574D-67CE-4347-AA6B-7DF8A04ED754}</Project>
+      <Name>Ringtoets.Piping.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Piping\test\Ringtoets.Piping.KernelWrapper.TestUtil\Ringtoets.Piping.KernelWrapper.TestUtil.csproj">
       <Project>{27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8}</Project>
       <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r716528adfed212743b359ecaf540a1027dbceb65 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 716528adfed212743b359ecaf540a1027dbceb65)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -37,6 +37,7 @@
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Data;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.StabilityPointStructures.Data;
@@ -403,15 +404,17 @@
             var calculation = new PipingCalculation(new GeneralPipingInput());
             var calculationWithOutput = new PipingCalculation(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             var calculationWithOutputAndHydraulicBoundaryLocation = new PipingCalculation(new GeneralPipingInput())
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 },
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             var calculationWithHydraulicBoundaryLocation = new PipingCalculation(new GeneralPipingInput())
             {
@@ -424,15 +427,17 @@
             var subCalculation = new PipingCalculation(new GeneralPipingInput());
             var subCalculationWithOutput = new PipingCalculation(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             var subCalculationWithOutputAndHydraulicBoundaryLocation = new PipingCalculation(new GeneralPipingInput())
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 },
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             var subCalculationWithHydraulicBoundaryLocation = new PipingCalculation(new GeneralPipingInput())
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4ce321e0acec2ea04fe99f4e855d319b0ac17298 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -171,7 +171,8 @@
 
             group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             });
 
             var pipingFailureMechanism = new PipingFailureMechanism();
@@ -287,7 +288,8 @@
 
             group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             });
 
             var pipingFailureMechanism = new PipingFailureMechanism();
@@ -825,10 +827,12 @@
                 var calculation1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 calculation1.Name = "A";
                 calculation1.Output = new TestPipingOutput();
+                calculation1.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput();
                 calculation1.Attach(calculation1Observer);
                 var calculation2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 calculation2.Name = "B";
                 calculation2.Output = new TestPipingOutput();
+                calculation2.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput();
                 calculation1.Attach(calculation2Observer);
 
                 var childGroup = new CalculationGroup();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4ce321e0acec2ea04fe99f4e855d319b0ac17298 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -102,7 +102,8 @@
             // Setup
             var calculation = new PipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
 
             var pipingFailureMechanism = new PipingFailureMechanism();
@@ -217,7 +218,8 @@
             {
                 var calculation = new PipingCalculationScenario(new GeneralPipingInput())
                 {
-                    Output = new TestPipingOutput()
+                    Output = new TestPipingOutput(),
+                    SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
                 };
                 var pipingFailureMechanism = new PipingFailureMechanism();
                 pipingFailureMechanism.AddSection(new FailureMechanismSection("A", new[]
@@ -454,6 +456,7 @@
                         StringAssert.StartsWith("Validatie van 'Nieuwe berekening' beëindigd om: ", msgs.Current);
                     });
                     Assert.IsNull(calculation.Output);
+                    Assert.IsNull(calculation.SemiProbabilisticOutput);
                 }
             }
         }
@@ -563,6 +566,7 @@
                         StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", msgs.Current);
                     });
                     Assert.IsNotNull(calculation.Output);
+                    Assert.IsNotNull(calculation.SemiProbabilisticOutput);
                 }
             }
         }
@@ -599,6 +603,7 @@
                 plugin.Gui = gui;
 
                 calculation.Output = new TestPipingOutput();
+                calculation.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput();
                 calculation.Attach(observer);
 
                 string messageBoxText = null, messageBoxTitle = null;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4ce321e0acec2ea04fe99f4e855d319b0ac17298 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -221,11 +221,13 @@
                 var generalInputParameters = new GeneralPipingInput();
                 var pipingCalculation1 = new PipingCalculationScenario(generalInputParameters)
                 {
-                    Output = new TestPipingOutput()
+                    Output = new TestPipingOutput(),
+                    SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
                 };
                 var pipingCalculation2 = new PipingCalculationScenario(generalInputParameters)
                 {
-                    Output = new TestPipingOutput()
+                    Output = new TestPipingOutput(),
+                    SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
                 };
 
                 var observer = mocks.StrictMock<IObserver>();
@@ -302,7 +304,8 @@
             }));
             var pipingCalculation = new PipingCalculationScenario(failureMechanism.GeneralInput)
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
             failureMechanism.CalculationsGroup.Children.Add(pipingCalculation);
 
@@ -400,7 +403,8 @@
             {
                 var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput())
                 {
-                    Output = new TestPipingOutput()
+                    Output = new TestPipingOutput(),
+                    SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
                 };
 
                 var failureMechanism = new PipingFailureMechanism();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r4ce321e0acec2ea04fe99f4e855d319b0ac17298 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -81,9 +81,11 @@
         {
             // Setup
             var originalOutput = new TestPipingOutput();
+            var originalSemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput();
 
             PipingCalculationScenario invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput();
             invalidPipingCalculation.Output = originalOutput;
+            invalidPipingCalculation.SemiProbabilisticOutput = originalSemiProbabilisticOutput;
 
             var activity = new PipingCalculationActivity(invalidPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN);
 
@@ -105,6 +107,7 @@
             });
             Assert.AreEqual(ActivityState.Failed, activity.State);
             Assert.AreEqual(originalOutput, invalidPipingCalculation.Output);
+            Assert.AreEqual(originalSemiProbabilisticOutput, invalidPipingCalculation.SemiProbabilisticOutput);
         }
 
         [Test]
@@ -113,6 +116,7 @@
             // Setup
             PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             validPipingCalculation.Output = null;
+            validPipingCalculation.SemiProbabilisticOutput = null;
 
             int norm = new Random(21).Next(100, 300000);
             var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), norm, double.NaN);
@@ -133,6 +137,7 @@
             });
             Assert.AreEqual(ActivityState.Executed, activity.State);
             Assert.IsNotNull(validPipingCalculation.Output);
+            Assert.IsNotNull(validPipingCalculation.SemiProbabilisticOutput);
         }
 
         [Test]
@@ -146,6 +151,7 @@
 
             PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             validPipingCalculation.Output = null;
+            validPipingCalculation.SemiProbabilisticOutput = null;
             validPipingCalculation.Attach(observerMock);
 
             var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs
===================================================================
diff -u -rb39d085012e7d50a761a38b485bf7c0e948ad7f4 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision b39d085012e7d50a761a38b485bf7c0e948ad7f4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -51,14 +51,16 @@
             // Setup
             var calculation = new PipingCalculation(new GeneralPipingInput())
             {
-                Output = new TestPipingOutput()
+                Output = new TestPipingOutput(),
+                SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
             };
 
             // Call
             PipingDataSynchronizationService.ClearCalculationOutput(calculation);
 
             // Assert
             Assert.IsNull(calculation.Output);
+            Assert.IsNull(calculation.SemiProbabilisticOutput);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs
===================================================================
diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r8723c31042f8aa4174e6d51a42f20d3665ec2da0
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs	(.../PipingSemiProbabilisticCalculationServiceTest.cs)	(revision b190a14336e0d8fe9aec34e81a68194081c76155)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs	(.../PipingSemiProbabilisticCalculationServiceTest.cs)	(revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
@@ -207,7 +207,7 @@
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
         }
 
-        private PipingCalculation AsPipingCalculation(PipingOutput pipingOutput)
+        private static PipingCalculation AsPipingCalculation(PipingOutput pipingOutput)
         {
             return new PipingCalculation(new GeneralPipingInput())
             {