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