Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc -r1dee1f59e8d9958f8a05d37d3f3331225540aee1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 1dee1f59e8d9958f8a05d37d3f3331225540aee1)
@@ -26,6 +26,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.GrassCoverErosionOutwards;
 using Application.Ringtoets.Storage.Serializers;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
@@ -212,11 +213,11 @@
         public void Read_EntityWithHydraulicBoundaryLocationInCollector_CalculationHasAlreadyReadHydraulicBoundaryLocation()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 1.1, 2.2);
-            var hydraulicLocationEntity = new GrassCoverErosionOutwardsHydraulicLocationEntity();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
             var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity
             {
-                GrassCoverErosionOutwardsHydraulicLocationEntity = hydraulicLocationEntity
+                HydraulicLocationEntity = hydraulicLocationEntity
             };
 
             var collector = new ReadConversionCollector();
@@ -230,29 +231,6 @@
         }
 
         [Test]
-        public void Read_EntityWithHydraulicBoundaryLocationNotYetInCollector_CalculationWithCreatedHydraulicBoundaryLocationAndRegisteredNewEntities()
-        {
-            // Setup
-            var hydraulicLocationEntity = new GrassCoverErosionOutwardsHydraulicLocationEntity
-            {
-                Name = "A"
-            };
-
-            var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity
-            {
-                GrassCoverErosionOutwardsHydraulicLocationEntity = hydraulicLocationEntity
-            };
-
-            var collector = new ReadConversionCollector();
-
-            // Call
-            entity.Read(collector);
-
-            // Assert
-            Assert.IsTrue(collector.Contains(hydraulicLocationEntity));
-        }
-
-        [Test]
         public void Read_EntityWithCalculationOutputEntity_CalculationWithOutput()
         {
             // Setup