Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r473a24c3ace837a552c2209eb93002d3cbf14140 -r650bc408cf4cc755aed422ea1b07d31e4cca11ec
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 473a24c3ace837a552c2209eb93002d3cbf14140)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 650bc408cf4cc755aed422ea1b07d31e4cca11ec)
@@ -191,6 +191,9 @@
     <Compile Include="DbContext\HydraRingPreprocessorEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="DbContext\HydraulicLocationCalculationCollectionEntity.cs">
+      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
+    </Compile>
     <Compile Include="DbContext\HydraulicLocationCalculationEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -678,6 +681,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.106.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.106.0\build\net40\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs
===================================================================
diff -u -r9b5282545f9cecd4b76fa8c40e730d863fb546e1 -r650bc408cf4cc755aed422ea1b07d31e4cca11ec
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs	(.../HydraulicLocationEntityTestFactoryTest.cs)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs	(.../HydraulicLocationEntityTestFactoryTest.cs)	(revision 650bc408cf4cc755aed422ea1b07d31e4cca11ec)
@@ -37,15 +37,6 @@
             // 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/Hydraulics/HydraulicLocationEntityTestFactory.cs
===================================================================
diff -u -r9b5282545f9cecd4b76fa8c40e730d863fb546e1 -r650bc408cf4cc755aed422ea1b07d31e4cca11ec
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs	(.../HydraulicLocationEntityTestFactory.cs)	(revision 9b5282545f9cecd4b76fa8c40e730d863fb546e1)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs	(.../HydraulicLocationEntityTestFactory.cs)	(revision 650bc408cf4cc755aed422ea1b07d31e4cca11ec)
@@ -38,29 +38,10 @@
         /// <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())
+                Name = "A"
             };
         }
-
-        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