Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CreateConversionCollectorTest.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r8a2d2653ceff765beecfcedab41a6be91df7d16e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CreateConversionCollectorTest.cs	(.../CreateConversionCollectorTest.cs)	(revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CreateConversionCollectorTest.cs	(.../CreateConversionCollectorTest.cs)	(revision 8a2d2653ceff765beecfcedab41a6be91df7d16e)
@@ -158,6 +158,24 @@
             Assert.Throws<InvalidOperationException>(test);
         }
 
+        [Test]
+        public void GetSurfaceLinePoint_SurfaceLinePointAdded_ReturnsEntity()
+        {
+            // Setup
+            var surfaceLineGeometryPoint = new Point3D(1.1, 2.2, 3.3);
+            var initializedEntity = new SurfaceLinePointEntity();
+
+            var collector = new CreateConversionCollector();
+            collector.Create(initializedEntity, surfaceLineGeometryPoint);
+
+            // Call
+            SurfaceLinePointEntity retrievedEntity = collector.GetSurfaceLinePoint(surfaceLineGeometryPoint);
+
+            // Assert
+            Assert.AreSame(initializedEntity, retrievedEntity);
+
+        }
+
         #region Create methods
 
         [Test]
@@ -400,6 +418,34 @@
             Assert.AreEqual("model", paramName);
         }
 
+        [Test]
+        public void Create_WithNullSurfaceLinePointEntity_ThrowsArgumentNullException()
+        {
+            // Setup
+            var collector = new CreateConversionCollector();
+
+            // Call
+            TestDelegate call = () => collector.Create(null, new Point3D(1.1, 2.2, 3.3));
+
+            // Assert
+            var paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("entity", paramName);
+        }
+
+        [Test]
+        public void Create_WithNullSurfaceLinePoint_ThrowsArgumentNullException()
+        {
+            // Setup
+            var collector = new CreateConversionCollector();
+
+            // Call
+            TestDelegate call = () => collector.Create(new SurfaceLinePointEntity(), null);
+
+            // Assert
+            var paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("model", paramName);
+        }
+
         #endregion
 
         #region TransferId method
@@ -614,6 +660,27 @@
             Assert.AreEqual(storageId, model.StorageId);
         }
 
+        [Test]
+        public void TransferId_WithSurfaceLinePointEntityAdded_EqualSurfaceLinePointEntityIdAndPoint3DStorageId()
+        {
+            // Setup
+            var collector = new CreateConversionCollector();
+
+            long storageId = new Random(21).Next(1, 4000);
+            var entity = new SurfaceLinePointEntity
+            {
+                SurfaceLinePointEntityId = storageId
+            };
+            var model = new Point3D(1.1, 2.2, 3.3);
+            collector.Create(entity, model);
+
+            // Call
+            collector.TransferIds();
+
+            // Assert
+            Assert.AreEqual(storageId, model.StorageId);
+        }
+
         #endregion
     }
 }
\ No newline at end of file