Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r039896ccc137efe3fe850d2cc062ba65ad69024c -r9b5282545f9cecd4b76fa8c40e730d863fb546e1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 039896ccc137efe3fe850d2cc062ba65ad69024c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -26,6 +26,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Serializers;
 using Application.Ringtoets.Storage.TestUtil;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
@@ -200,18 +201,17 @@
             const string testVersion = "testVersion";
             entity.HydraulicDatabaseLocation = testLocation;
             entity.HydraulicDatabaseVersion = testVersion;
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "A",
-                Order = 1
-            });
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "B",
-                Order = 0
-            });
             entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
+            HydraulicLocationEntity hydraulicLocationEntityOne = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "A";
+            hydraulicLocationEntityOne.Order = 1;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityOne);
+            HydraulicLocationEntity hydraulicLocationEntityTwo = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "B";
+            hydraulicLocationEntityOne.Order = 0;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityTwo);
+
             var collector = new ReadConversionCollector();
 
             // Call
@@ -243,23 +243,22 @@
             const string preprocessorDirectory = "preprocessorLocation";
             entity.HydraulicDatabaseLocation = testLocation;
             entity.HydraulicDatabaseVersion = testVersion;
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "A",
-                Order = 1
-            });
-            entity.HydraulicLocationEntities.Add(new HydraulicLocationEntity
-            {
-                Name = "B",
-                Order = 0
-            });
             entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
             entity.HydraRingPreprocessorEntities.Add(new HydraRingPreprocessorEntity
             {
                 UsePreprocessor = usePreprocessor,
                 PreprocessorDirectory = preprocessorDirectory
             });
 
+            HydraulicLocationEntity hydraulicLocationEntityOne = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "A";
+            hydraulicLocationEntityOne.Order = 1;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityOne);
+            HydraulicLocationEntity hydraulicLocationEntityTwo = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+            hydraulicLocationEntityOne.Name = "B";
+            hydraulicLocationEntityOne.Order = 0;
+            entity.HydraulicLocationEntities.Add(hydraulicLocationEntityTwo);
+
             var collector = new ReadConversionCollector();
 
             // Call
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r8900f570b33f0de1a512fc5b2509771e1201672c -r9b5282545f9cecd4b76fa8c40e730d863fb546e1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs)	(revision 8900f570b33f0de1a512fc5b2509771e1201672c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -24,6 +24,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.GrassCoverErosionInwards;
 using Application.Ringtoets.Storage.Serializers;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -238,10 +239,7 @@
         public void Read_ValidEntityWithUnreadHydraulicLocationEntity_ReturnCalculationWithNewHydraulicBoundaryLocation()
         {
             // Setup
-            var hydroLocationEntity = new HydraulicLocationEntity
-            {
-                Name = "A"
-            };
+            HydraulicLocationEntity hydroLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
             var entity = new GrassCoverErosionInwardsCalculationEntity
             {
                 HydraulicLocationEntity = hydroLocationEntity
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rab1121dee05c5484181bb1b0470d49eb48d325fe -r9b5282545f9cecd4b76fa8c40e730d863fb546e1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision ab1121dee05c5484181bb1b0470d49eb48d325fe)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -24,6 +24,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.Piping;
 using Application.Ringtoets.Storage.Serializers;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
@@ -215,11 +216,7 @@
         public void Read_EntityWithHydraulicBoundaryLocationNotYetInCollector_CalculationWithCreatedHydraulicBoundaryLocationAndRegisteredNewEntities()
         {
             // Setup
-            var hydraulicLocationEntity = new HydraulicLocationEntity
-            {
-                Name = "A"
-            };
-
+            HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
             var entity = new PipingCalculationEntity
             {
                 HydraulicLocationEntity = hydraulicLocationEntity,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc -r9b5282545f9cecd4b76fa8c40e730d863fb546e1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -26,6 +26,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.StabilityStoneCover;
 using Application.Ringtoets.Storage.Serializers;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
@@ -233,11 +234,7 @@
         public void Read_EntityWithHydraulicBoundaryLocationNotYetInCollector_CalculationWithCreatedHydraulicBoundaryLocationAndRegisteredNewEntities()
         {
             // Setup
-            var hydraulicLocationEntity = new HydraulicLocationEntity
-            {
-                Name = "A"
-            };
-
+            HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
             var entity = new StabilityStoneCoverWaveConditionsCalculationEntity
             {
                 HydraulicLocationEntity = hydraulicLocationEntity
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc -r9b5282545f9cecd4b76fa8c40e730d863fb546e1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 8ff26e0d7885f432a6e470e8d68ce325bdc6a9bc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -26,6 +26,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.WaveImpactAsphaltCover;
 using Application.Ringtoets.Storage.Serializers;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
@@ -233,11 +234,7 @@
         public void Read_EntityWithHydraulicBoundaryLocationNotYetInCollector_CalculationWithCreatedHydraulicBoundaryLocationAndRegisteredNewEntities()
         {
             // Setup
-            var hydraulicLocationEntity = new HydraulicLocationEntity
-            {
-                Name = "A"
-            };
-
+            HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
             var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity
             {
                 HydraulicLocationEntity = hydraulicLocationEntity
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj
===================================================================
diff -u -r3e9547a3e5375a431aaf4ad4192e9c087e0a6a75 -r9b5282545f9cecd4b76fa8c40e730d863fb546e1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj	(.../Application.Ringtoets.Storage.TestUtil.Test.csproj)	(revision 3e9547a3e5375a431aaf4ad4192e9c087e0a6a75)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj	(.../Application.Ringtoets.Storage.TestUtil.Test.csproj)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -24,6 +24,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Hydraulics\HydraulicLocationEntityTestFactoryTest.cs" />
     <Compile Include="IllustrationPoints\GeneralResultEntityTestHelperTest.cs" />
     <Compile Include="MacroStabilityInwards\MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs" />
     <Compile Include="MacroStabilityInwards\MacroStabilityInwardsStochasticSoilProfileEntityTestFactoryTest.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -0,0 +1,51 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.TestUtil.Hydraulics;
+using NUnit.Framework;
+
+namespace Application.Ringtoets.Storage.TestUtil.Test.Hydraulics
+{
+    [TestFixture]
+    public class HydraulicLocationEntityTestFactoryTest
+    {
+        [Test]
+        public void CreateHydraulicLocationEntity_Always_ReturnsExpectedValues()
+        {
+            // Call
+            HydraulicLocationEntity entity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity();
+
+            // Assert
+            Assert.IsNotNull(entity);
+            Assert.IsNotEmpty(entity.Name);
+
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity);
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity1);
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity2);
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity3);
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity4);
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity5);
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity6);
+            Assert.IsNotNull(entity.HydraulicLocationCalculationEntity7);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj
===================================================================
diff -u -r1ad608d6d74fd2ee54be546f1ea368baf4c5db1d -r9b5282545f9cecd4b76fa8c40e730d863fb546e1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision 1ad608d6d74fd2ee54be546f1ea368baf4c5db1d)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -21,6 +21,7 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Hydraulics\HydraulicLocationEntityTestFactory.cs" />
     <Compile Include="IllustrationPoints\GeneralResultEntityTestHelper.cs" />
     <Compile Include="MacroStabilityInwards\MacroStabilityInwardsCalculationEntityTestHelper.cs" />
     <Compile Include="MacroStabilityInwards\MacroStabilityInwardsCalculationOutputEntityTestHelper.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
@@ -0,0 +1,66 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Core.Common.TestUtil;
+
+namespace Application.Ringtoets.Storage.TestUtil.Hydraulics
+{
+    /// <summary>
+    /// Factory for creating <see cref="HydraulicLocationEntity"/>
+    /// which cam be used for testing.
+    /// </summary>
+    public static class HydraulicLocationEntityTestFactory
+    {
+        /// <summary>
+        /// Creates a minimal <see cref="HydraulicLocationEntity"/> with a configured
+        /// name and its hydraulic calculation entities set.
+        /// </summary>
+        /// <returns>A valid <see cref="HydraulicLocationEntity"/>.</returns>
+        public static HydraulicLocationEntity CreateHydraulicLocationEntity()
+        {
+            var random = new Random(21);
+            return new HydraulicLocationEntity
+            {
+                Name = "A",
+                HydraulicLocationCalculationEntity = CreateCalculationEntity(random.Next()),
+                HydraulicLocationCalculationEntity1 = CreateCalculationEntity(random.Next()),
+                HydraulicLocationCalculationEntity2 = CreateCalculationEntity(random.Next()),
+                HydraulicLocationCalculationEntity3 = CreateCalculationEntity(random.Next()),
+                HydraulicLocationCalculationEntity4 = CreateCalculationEntity(random.Next()),
+                HydraulicLocationCalculationEntity5 = CreateCalculationEntity(random.Next()),
+                HydraulicLocationCalculationEntity6 = CreateCalculationEntity(random.Next()),
+                HydraulicLocationCalculationEntity7 = CreateCalculationEntity(random.Next())
+            };
+        }
+
+        private static HydraulicLocationCalculationEntity CreateCalculationEntity(int seed)
+        {
+            var random = new Random(seed);
+
+            return new HydraulicLocationCalculationEntity
+            {
+                ShouldIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean())
+            };
+        }
+    }
+}
\ No newline at end of file