Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ReferenceLineTestFactoryTest.cs
===================================================================
diff -u -r247c93dd6e03e9a6eca6104c30363c4b318902c1 -r350b7e0cbfcbd2f74664a075577b4b0e05b7c62e
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ReferenceLineTestFactoryTest.cs	(.../ReferenceLineTestFactoryTest.cs)	(revision 247c93dd6e03e9a6eca6104c30363c4b318902c1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ReferenceLineTestFactoryTest.cs	(.../ReferenceLineTestFactoryTest.cs)	(revision 350b7e0cbfcbd2f74664a075577b4b0e05b7c62e)
@@ -46,10 +46,13 @@
         }
 
         [Test]
-        public void CreateReferenceLineGeometry_Always_ReturnsExpectedValues()
+        public void CreateReferenceLineGeometry_WithReferenceLine_SetsExpectedGeometry()
         {
+            // Setup
+            var referenceLine = new ReferenceLine();
+
             // Call
-            IEnumerable<Point2D> geometry = ReferenceLineTestFactory.CreateReferenceLineGeometry();
+            ReferenceLineTestFactory.CreateReferenceLineGeometry(referenceLine);
 
             // Assert
             CollectionAssert.AreEqual(new[]
@@ -58,7 +61,7 @@
                 new Point2D(2, 2),
                 new Point2D(3, 3),
                 new Point2D(4, 4)
-            }, geometry);
+            }, referenceLine.Points);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ReferenceLineTestFactory.cs
===================================================================
diff -u -r247c93dd6e03e9a6eca6104c30363c4b318902c1 -r350b7e0cbfcbd2f74664a075577b4b0e05b7c62e
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ReferenceLineTestFactory.cs	(.../ReferenceLineTestFactory.cs)	(revision 247c93dd6e03e9a6eca6104c30363c4b318902c1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ReferenceLineTestFactory.cs	(.../ReferenceLineTestFactory.cs)	(revision 350b7e0cbfcbd2f74664a075577b4b0e05b7c62e)
@@ -38,23 +38,23 @@
         public static ReferenceLine CreateReferenceLineWithGeometry()
         {
             var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(CreateReferenceLineGeometry());
+            CreateReferenceLineGeometry(referenceLine);
             return referenceLine;
         }
 
         /// <summary>
-        /// Creates default geometry for a <see cref="ReferenceLine"/>.
+        /// Creates a default geometry for a <see cref="ReferenceLine"/>.
         /// </summary>
         /// <returns>A geometry</returns>
-        public static IEnumerable<Point2D> CreateReferenceLineGeometry()
+        public static void CreateReferenceLineGeometry(ReferenceLine referenceLine)
         {
-            return new[]
+            referenceLine.SetGeometry(new[]
             {
                 new Point2D(1, 1),
                 new Point2D(2, 2),
                 new Point2D(3, 3),
                 new Point2D(4, 4)
-            };
+            });
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs
===================================================================
diff -u -r770689b198dfd2e2565694dfe376e7a225be134d -r350b7e0cbfcbd2f74664a075577b4b0e05b7c62e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs	(.../AssemblyResultPerSectionViewTest.cs)	(revision 770689b198dfd2e2565694dfe376e7a225be134d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs	(.../AssemblyResultPerSectionViewTest.cs)	(revision 350b7e0cbfcbd2f74664a075577b4b0e05b7c62e)
@@ -455,7 +455,7 @@
         {
             // Given
             var assessmentSection = new AssessmentSection(new Random(21).NextEnumValue<AssessmentSectionComposition>());
-            assessmentSection.ReferenceLine.SetGeometry(ReferenceLineTestFactory.CreateReferenceLineGeometry());
+            ReferenceLineTestFactory.CreateReferenceLineGeometry(assessmentSection.ReferenceLine);
             foreach (IHasSectionResults<FailureMechanismSectionResult> failureMechanism in assessmentSection.GetFailureMechanisms()
                                                                                                             .Cast<IHasSectionResults<FailureMechanismSectionResult>>())
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -r770689b198dfd2e2565694dfe376e7a225be134d -r350b7e0cbfcbd2f74664a075577b4b0e05b7c62e
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 770689b198dfd2e2565694dfe376e7a225be134d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 350b7e0cbfcbd2f74664a075577b4b0e05b7c62e)
@@ -66,7 +66,7 @@
                 Name = name,
                 Id = id
             };
-            assessmentSection.ReferenceLine.SetGeometry(ReferenceLineTestFactory.CreateReferenceLineGeometry());
+            ReferenceLineTestFactory.CreateReferenceLineGeometry(assessmentSection.ReferenceLine);
 
             FailureMechanismTestHelper.AddSections(assessmentSection.Piping, random.Next(1, 10));
             FailureMechanismTestHelper.AddSections(assessmentSection.MacroStabilityInwards, random.Next(1, 10));
@@ -138,7 +138,7 @@
             {
                 Id = "1"
             };
-            assessmentSection.ReferenceLine.SetGeometry(ReferenceLineTestFactory.CreateReferenceLineGeometry());
+            ReferenceLineTestFactory.CreateReferenceLineGeometry(assessmentSection.ReferenceLine);
 
             PipingFailureMechanism failureMechanism = assessmentSection.Piping;
             failureMechanism.IsRelevant = true;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/AssemblyResultsContextExportInfoTest.cs
===================================================================
diff -u -r1d1c635affe9ac0e8454cd1badea40cf11669916 -r350b7e0cbfcbd2f74664a075577b4b0e05b7c62e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/AssemblyResultsContextExportInfoTest.cs	(.../AssemblyResultsContextExportInfoTest.cs)	(revision 1d1c635affe9ac0e8454cd1badea40cf11669916)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/AssemblyResultsContextExportInfoTest.cs	(.../AssemblyResultsContextExportInfoTest.cs)	(revision 350b7e0cbfcbd2f74664a075577b4b0e05b7c62e)
@@ -121,7 +121,7 @@
             // Setup
             var random = new Random(21);
             var assessmentSection = new AssessmentSection(random.NextEnumValue<AssessmentSectionComposition>());
-            assessmentSection.ReferenceLine.SetGeometry(ReferenceLineTestFactory.CreateReferenceLineGeometry());
+            ReferenceLineTestFactory.CreateReferenceLineGeometry(assessmentSection.ReferenceLine);
 
             var context = new AssemblyResultsContext(assessmentSection);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs
===================================================================
diff -u -r739c37f3a0c1938b48bd48a2d7a90ea760edffd3 -r350b7e0cbfcbd2f74664a075577b4b0e05b7c62e
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs	(.../AssessmentSectionMergeComparerTest.cs)	(revision 739c37f3a0c1938b48bd48a2d7a90ea760edffd3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs	(.../AssessmentSectionMergeComparerTest.cs)	(revision 350b7e0cbfcbd2f74664a075577b4b0e05b7c62e)
@@ -135,23 +135,12 @@
 
         private static IEnumerable<ChangePropertyData<AssessmentSection>> ChangeSingleDataProperties()
         {
-            var referenceLineDifferentPointCount = new ReferenceLine();
-            referenceLineDifferentPointCount.SetGeometry(new[]
-            {
-                new Point2D(1, 1)
-            });
             yield return new ChangePropertyData<AssessmentSection>(sec => sec.ReferenceLine.SetGeometry(new[]
                                                                    {
                                                                        new Point2D(1, 1)
                                                                    }),
                                                                    "Referenceline different point count");
 
-            var referenceLineDifferentPoint = new ReferenceLine();
-            referenceLineDifferentPoint.SetGeometry(new[]
-            {
-                new Point2D(1, 1),
-                new Point2D(1, 3)
-            });
             yield return new ChangePropertyData<AssessmentSection>(sec => sec.ReferenceLine.SetGeometry(new[]
                                                                    {
                                                                        new Point2D(1, 1),
Index: Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs
===================================================================
diff -u -re949ab20d487bf97ab1cedf2b360fdb1f948419f -r350b7e0cbfcbd2f74664a075577b4b0e05b7c62e
--- Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs	(.../ReferenceLineImporterIntegrationTest.cs)	(revision e949ab20d487bf97ab1cedf2b360fdb1f948419f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs	(.../ReferenceLineImporterIntegrationTest.cs)	(revision 350b7e0cbfcbd2f74664a075577b4b0e05b7c62e)
@@ -50,10 +50,9 @@
             var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
 
-            Point2D[] originalReferenceLineGeometry = ReferenceLineTestFactory.CreateReferenceLineGeometry().ToArray();
-
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            assessmentSection.ReferenceLine.SetGeometry(originalReferenceLineGeometry);
+            ReferenceLineTestFactory.CreateReferenceLineGeometry(assessmentSection.ReferenceLine);
+            Point2D[] originalReferenceLineGeometry = assessmentSection.ReferenceLine.Points.ToArray();
 
             var handler = new ReferenceLineUpdateHandler(assessmentSection, viewCommands);
             string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp");