Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -r305b053dc83b31a9ea20e78ab6c0e6801d6085bf -rdae8dd28223d61ff9d5ae061f77834aa74e94f6f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 305b053dc83b31a9ea20e78ab6c0e6801d6085bf)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision dae8dd28223d61ff9d5ae061f77834aa74e94f6f)
@@ -20,11 +20,9 @@
 // All rights reserved.
 
 using System;
-using Application.Ringtoets.Storage.Create.IllustrationPoints;
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Utils.Extensions;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.IllustrationPoints;
 
 namespace Application.Ringtoets.Storage.Create
 {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs
===================================================================
diff -u -r19d976fb7e64bc4c23ca6a601eb47d876b1fecff -rdae8dd28223d61ff9d5ae061f77834aa74e94f6f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs)	(revision 19d976fb7e64bc4c23ca6a601eb47d876b1fecff)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs)	(revision dae8dd28223d61ff9d5ae061f77834aa74e94f6f)
@@ -22,7 +22,6 @@
 using System;
 using System.Linq;
 using Application.Ringtoets.Storage.DbContext;
-using Application.Ringtoets.Storage.Read.IllustrationPoints;
 using Ringtoets.Common.Data.Hydraulics;
 
 namespace Application.Ringtoets.Storage.Read.GrassCoverErosionOutwards
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs
===================================================================
diff -u -r659839900c53f9f65ffe8c811e0cb876de55398f -rdae8dd28223d61ff9d5ae061f77834aa74e94f6f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs)	(revision 659839900c53f9f65ffe8c811e0cb876de55398f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs)	(revision dae8dd28223d61ff9d5ae061f77834aa74e94f6f)
@@ -36,20 +36,13 @@
     public class HydraulicBoundaryLocationOutputCreateExtensionsTest
     {
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void CreateHydraulicLocationOutputEntity_WithValidParameters_ReturnsHydraulicLocationEntityWithOutputSet(
-            bool withIllustrationPoints)
+        public void CreateHydraulicLocationOutputEntity_WithValidParameters_ReturnsHydraulicLocationEntityWithOutputSet()
         {
             // Setup
             var random = new Random(21);
-
-            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = withIllustrationPoints
-                                                                                     ? GetGeneralResult()
-                                                                                     : null;
             var output = new HydraulicBoundaryLocationOutput(
                 random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextDouble(), random.NextEnumValue<CalculationConvergence>(), generalResult);
+                random.NextDouble(), random.NextEnumValue<CalculationConvergence>(), null);
 
             var outputType = random.NextEnumValue<HydraulicLocationOutputType>();
 
@@ -66,23 +59,16 @@
             Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
             Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence);
 
-            AssertGeneralResult(output.GeneralResult,
-                                entity.GeneralResultSubMechanismIllustrationPointEntity);
+            AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void CreateHydraulicLocationOutputEntity_WithNaNParameters_ReturnsHydraulicLocationEntityWithOutputNaN(
-            bool withIllustrationPoints)
+        public void CreateHydraulicLocationOutputEntity_WithNaNParameters_ReturnsHydraulicLocationEntityWithOutputNaN()
         {
             // Setup
             var random = new Random(21);
-            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = withIllustrationPoints
-                                                                                     ? GetGeneralResult()
-                                                                                     : null;
             var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN,
-                                                             double.NaN, double.NaN, random.NextEnumValue<CalculationConvergence>(), generalResult);
+                                                             double.NaN, double.NaN, random.NextEnumValue<CalculationConvergence>(), null);
 
             var outputType = random.NextEnumValue<HydraulicLocationOutputType>();
 
@@ -99,25 +85,35 @@
             Assert.IsNull(entity.CalculatedReliability);
             Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence);
 
-            AssertGeneralResult(output.GeneralResult,
-                                entity.GeneralResultSubMechanismIllustrationPointEntity);
+            AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithValidParameters_ReturnsHydraulicLocationEntityWithOutputSet(
-            bool withIllustrationPoints)
+        public void CreateHydraulicLocationOutputEntity_WithGeneralResult_ReturnsHydraulicLocationEntityWithGeneralResult()
         {
             // Setup
             var random = new Random(21);
+            var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN,
+                                                             double.NaN, double.NaN, random.NextEnumValue<CalculationConvergence>(),
+                                                             GetGeneralResult());
 
-            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = withIllustrationPoints
-                                                                                     ? GetGeneralResult()
-                                                                                     : null;
+            var outputType = random.NextEnumValue<HydraulicLocationOutputType>();
+
+            // Call
+            var entity = output.Create<HydraulicLocationOutputEntity>(outputType);
+
+            // Assert
+            AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
+        }
+
+        [Test]
+        public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithValidParameters_ReturnsHydraulicLocationEntityWithOutputSet()
+        {
+            // Setup
+            var random = new Random(21);
             var output = new HydraulicBoundaryLocationOutput(
                 random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextDouble(), random.NextEnumValue<CalculationConvergence>(), generalResult);
+                random.NextDouble(), random.NextEnumValue<CalculationConvergence>(), null);
 
             var outputType = random.NextEnumValue<HydraulicLocationOutputType>();
 
@@ -134,24 +130,16 @@
             Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
             Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence);
 
-            AssertGeneralResult(output.GeneralResult,
-                                entity.GeneralResultSubMechanismIllustrationPointEntity);
+            AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithNaNParameters_ReturnsHydraulicLocationEntityWithOutputNaN(
-            bool withIllustrationPoints)
+        public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithNaNParameters_ReturnsHydraulicLocationEntityWithOutputNaN()
         {
             // Setup
             var random = new Random(21);
-
-            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = withIllustrationPoints
-                                                                                     ? GetGeneralResult()
-                                                                                     : null;
             var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN,
-                                                             double.NaN, double.NaN, random.NextEnumValue<CalculationConvergence>(), generalResult);
+                                                             double.NaN, double.NaN, random.NextEnumValue<CalculationConvergence>(), null);
 
             var outputType = random.NextEnumValue<HydraulicLocationOutputType>();
 
@@ -173,11 +161,29 @@
                                 entity.GeneralResultSubMechanismIllustrationPointEntity);
         }
 
+        [Test]
+        public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithGeneralResult_ReturnsHydraulicLocationEntityWithGeneralResult()
+        {
+            // Setup
+            var random = new Random(21);
+            var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN,
+                                                             double.NaN, double.NaN, random.NextEnumValue<CalculationConvergence>(),
+                                                             GetGeneralResult());
+
+            var outputType = random.NextEnumValue<HydraulicLocationOutputType>();
+
+            // Call
+            var entity = output.Create<GrassCoverErosionOutwardsHydraulicLocationOutputEntity>(outputType);
+
+            // Assert
+            AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
+        }
+
         private static GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResult()
         {
             var random = new Random(55);
             var generalResult = new GeneralResult<TopLevelSubMechanismIllustrationPoint>(
-                new WindDirection("SSE", random.NextDouble()),
+                WindDirectionTestFactory.CreateTestWindDirection(),
                 new[]
                 {
                     new Stochast("stochastOne", random.NextDouble(), random.NextDouble())
@@ -207,29 +213,9 @@
             Assert.AreEqual(governingWindDirection.Angle, entity.GoverningWindDirectionAngle,
                             governingWindDirection.Angle.GetAccuracy());
 
-            AssertStochastEntities(illustrationPoint.Stochasts.ToArray(), entity.StochastEntities.ToArray());
+            Assert.AreEqual(illustrationPoint.Stochasts.Count(), entity.StochastEntities.Count);
             Assert.AreEqual(illustrationPoint.TopLevelIllustrationPoints.Count(),
                             entity.TopLevelSubMechanismIllustrationPointEntities.Count);
         }
-
-        private static void AssertStochastEntities(Stochast[] stochasts, StochastEntity[] stochastEntities)
-        {
-            Assert.AreEqual(stochasts.Length, stochastEntities.Length);
-            for (var i = 0; i < stochasts.Length; i++)
-            {
-                AssertStochastEntity(stochasts[i], stochastEntities[i], i);
-            }
-        }
-
-        private static void AssertStochastEntity(Stochast stochast,
-                                                 StochastEntity stochastEntity,
-                                                 int expectedOrder)
-        {
-            TestHelper.AssertAreEqualButNotSame(stochast.Name, stochastEntity.Name);
-            Assert.AreEqual(stochast.Duration, stochastEntity.Duration, stochast.Duration.GetAccuracy());
-            Assert.AreEqual(stochast.Alpha, stochastEntity.Alpha, stochast.Alpha.GetAccuracy());
-
-            Assert.AreEqual(expectedOrder, stochastEntity.Order);
-        }
     }
 }
\ No newline at end of file