Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r23766b602d9b509a2ffc030f284e8d5e82325a3e -r508d720230c5f63bce7f95bddc3b7a04808d267d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 23766b602d9b509a2ffc030f284e8d5e82325a3e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 508d720230c5f63bce7f95bddc3b7a04808d267d)
@@ -102,26 +102,21 @@
             double firstY = random.NextDouble();
             double secondX = random.NextDouble();
             double secondY = random.NextDouble();
-            entity.ReferenceLinePointEntities.Add(new ReferenceLinePointEntity
+
+            var points = new[]
             {
-                Order = 2, X = firstX, Y = firstY
-            });
-            entity.ReferenceLinePointEntities.Add(new ReferenceLinePointEntity
-            {
-                Order = 1, X = secondX, Y = secondY
-            });
+                new Point2D(firstX, firstY),
+                new Point2D(secondX, secondY)
+            };
+            entity.ReferenceLinePointData = new Point2DBinaryConverter().ToBytes(points);
 
             var collector = new ReadConversionCollector();
 
             // Call
             var section = entity.Read(collector);
 
             // Assert
-            Assert.AreEqual(2, section.ReferenceLine.Points.Count());
-            Assert.AreEqual(secondX, section.ReferenceLine.Points.ElementAt(0).X, 1e-6);
-            Assert.AreEqual(secondY, section.ReferenceLine.Points.ElementAt(0).Y, 1e-6);
-            Assert.AreEqual(firstX, section.ReferenceLine.Points.ElementAt(1).X, 1e-6);
-            Assert.AreEqual(firstY, section.ReferenceLine.Points.ElementAt(1).Y, 1e-6);
+            CollectionAssert.AreEqual(points, section.ReferenceLine.Points);
         }
 
         [Test]
@@ -220,11 +215,11 @@
                 {
                     new StochasticSoilModelEntity
                     {
-                        SegmentPoints = emptySegmentPointsData
+                        StochasticSoilModelSegmentPointData = emptySegmentPointsData
                     },
                     new StochasticSoilModelEntity
                     {
-                        SegmentPoints = emptySegmentPointsData
+                        StochasticSoilModelSegmentPointData = emptySegmentPointsData
                     }
                 }
             };
@@ -250,6 +245,7 @@
             var entity = CreateAssessmentSectionEntity();
             var entityId = new Random(21).Next(1, 502);
 
+            var emptyPointsData = new Point3DBinaryConverter().ToBytes(new Point3D[0]);
             var failureMechanismEntity = new FailureMechanismEntity
             {
                 FailureMechanismEntityId = entityId,
@@ -261,8 +257,14 @@
                 IsRelevant = Convert.ToByte(isRelevant),
                 SurfaceLineEntities =
                 {
-                    new SurfaceLineEntity(),
-                    new SurfaceLineEntity()
+                    new SurfaceLineEntity
+                    {
+                        PointsData = emptyPointsData
+                    },
+                    new SurfaceLineEntity
+                    {
+                        PointsData = emptyPointsData
+                    }
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
@@ -545,25 +547,24 @@
 
         private static FailureMechanismSectionEntity[] CreateFailureMechanismSectionEntities()
         {
+            var dummyPointData = new[]
+            {
+                new Point2D(0.0, 0.0)
+            };
+            byte[] dummyPointBinaryData = new Point2DBinaryConverter().ToBytes(dummyPointData);
             return new[]
             {
                 new FailureMechanismSectionEntity
                 {
                     FailureMechanismSectionEntityId = 1,
                     Name = "",
-                    FailureMechanismSectionPointEntities =
-                    {
-                        new FailureMechanismSectionPointEntity()
-                    }
+                    FailureMechanismSectionPointData = dummyPointBinaryData
                 },
                 new FailureMechanismSectionEntity
                 {
                     FailureMechanismSectionEntityId = 2,
                     Name = "",
-                    FailureMechanismSectionPointEntities =
-                    {
-                        new FailureMechanismSectionPointEntity()
-                    }
+                    FailureMechanismSectionPointData = dummyPointBinaryData
                 }
             };
         }