Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs
===================================================================
diff -u -rbce62ec6102f15b0dbb1328fd9d14063fd21c978 -r21b2f912e42c334efafdf907ad6f0c14b84187be
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs	(.../StructuresCalculationCreateExtensionsTest.cs)	(revision bce62ec6102f15b0dbb1328fd9d14063fd21c978)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs	(.../StructuresCalculationCreateExtensionsTest.cs)	(revision 21b2f912e42c334efafdf907ad6f0c14b84187be)
@@ -163,6 +163,8 @@
             Assert.AreEqual((short) input.BreakWater.Type, entity.BreakWaterType);
             Assert.AreEqual(Convert.ToByte(input.UseBreakWater), entity.UseBreakWater);
             Assert.AreEqual(Convert.ToByte(input.UseForeshore), entity.UseForeshore);
+
+            Assert.IsFalse(calculation.HasOutput);
         }
 
         [Test]
@@ -521,6 +523,8 @@
             Assert.AreEqual(inputParameters.LevelCrestStructureNotClosing.StandardDeviation.Value, entity.LevelCrestStructureNotClosingStandardDeviation);
             Assert.AreEqual(inputParameters.ProbabilityOpenStructureBeforeFlooding, entity.ProbabilityOpenStructureBeforeFlooding);
             Assert.AreEqual(order, entity.Order);
+
+            Assert.IsFalse(calculation.HasOutput);
         }
 
         [Test]
@@ -705,6 +709,27 @@
             Assert.IsNotNull(entity.ForeshoreProfileEntity);
         }
 
+        [Test]
+        public void CreateForClosingStructures_CalculationWithOutput_ReturnEntity()
+        {
+            // Setup
+            var random = new Random(160);
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
+            {
+                Output = new ProbabilityAssessmentOutput(random.NextDouble(), random.NextDouble(),
+                                                         random.NextDouble(), random.NextDouble(),
+                                                         random.NextDouble())
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            ClosingStructuresCalculationEntity entity = calculation.CreateForClosingStructures(registry, 0);
+
+            // Assert
+            Assert.AreEqual(1, entity.ClosingStructuresOutputEntities.Count);
+        }
+
         #endregion
     }
 }
\ No newline at end of file