Index: src/Deltares.Geotechnics.IO.Tests/CharacteristicPointsImporterTest.cs
===================================================================
diff -u -r14 -r51
--- src/Deltares.Geotechnics.IO.Tests/CharacteristicPointsImporterTest.cs	(.../CharacteristicPointsImporterTest.cs)	(revision 14)
+++ src/Deltares.Geotechnics.IO.Tests/CharacteristicPointsImporterTest.cs	(.../CharacteristicPointsImporterTest.cs)	(revision 51)
@@ -1,14 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Deltares.DeltaModel;
 using Deltares.Geometry;
 using Deltares.Geotechnics.GeotechnicalGeometry;
 using Deltares.Geotechnics.IO.Importers;
 using Deltares.Standard.Extensions;
 using Deltares.Standard.Forms;
-using Deltares.Standard.IO;
-using Deltares.Standard.TestUtils;
 using NUnit.Framework;
 
 namespace Deltares.Geotechnics.IO.Tests
@@ -20,104 +18,18 @@
         /// Check if Import() returns the correct characteristic points.
         /// </summary>
         [Test]
-        public void ImportReturnsCorrectCharacteristicPointsWhenReadingSurfaceLinesAfterwards()
-        {
-            var deltaModel = new DeltaModel.DeltaModel();
-            var deltaModelFactory = new DeltaModelFactory(deltaModel);
-
-            var multiImporter = new MultiImporter();
-            multiImporter.DataFactory = deltaModelFactory;
-
-            var fileName = Path.Combine(mapTestData, surfaceLinesFilename);
-            Assert.IsTrue(File.Exists(fileName));
-            multiImporter.Importers.Add(new SurfaceLinesImporter
-                {
-                    FileName = fileName, Factory = deltaModelFactory
-                });
-            fileName = Path.Combine(mapTestData, characteristicPointsFilename);
-            Assert.IsTrue(File.Exists(fileName));
-            multiImporter.Importers.Add(new CharacteristicPointsImporter
-            {
-                FileName = fileName,
-                Factory = deltaModelFactory
-            });
-
-            multiImporter.ImportAll(null);
-
-            Assert.AreEqual(32, deltaModel.SurfaceLines.Count, "Read incorrect number of surface lines in import of characteristic points");
-            SurfaceLine2 surfaceLine = deltaModel.SchematizedSurfaceLines.FirstOrDefault(x => x.Name.Equals("dijkring10_dwp36_9"));
-            Assert.IsNotNull(surfaceLine);
-
-            Assert.AreEqual(31, surfaceLine.Geometry.Count, "Incorrect number of points in surface line");
-
-            Assert.AreEqual(0.0, surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X, tolerance);
-            Assert.AreEqual(1.06, surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).Z, tolerance);
-            Assert.AreEqual(100.0, surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, tolerance);
-            Assert.AreEqual(-0.61, surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, tolerance);
-        }
-
-        /// <summary>
-        /// Check if Import() returns the correct characteristic points.
-        /// </summary>
-        [Test]
-        public void ImportReturnsCorrectCharacteristicPointsWhenReadingSurfaceLinesFirst()
-        {
-            var deltaModel = new DeltaModel.DeltaModel();
-            var deltaModelFactory = new DeltaModelFactory(deltaModel);
-
-            var multiImporter = new MultiImporter();
-            multiImporter.DataFactory = deltaModelFactory;
-
-            var fileName = Path.Combine(mapTestData, surfaceLinesFilename);
-            Assert.IsTrue(File.Exists(fileName));
-            multiImporter.Importers.Add(new SurfaceLinesImporter
-                {
-                    FileName = fileName, Factory = deltaModelFactory
-                });
-
-            fileName = Path.Combine(mapTestData, characteristicPointsFilename);
-            Assert.IsTrue(File.Exists(fileName));
-            multiImporter.Importers.Add(new CharacteristicPointsImporter
-                {
-                    FileName = fileName, Factory = deltaModelFactory
-                });
-
-            multiImporter.ImportAll(null);
-
-            Assert.AreEqual(32, deltaModel.SurfaceLines.Count, "Read incorrect number of surface lines in import of characteristic points");
-            SurfaceLine2 schematizedSurfaceLine = deltaModel.SchematizedSurfaceLines.FirstOrDefault(x => x.Name.Equals("dijkring10_dwp36_9"));
-            Assert.IsNotNull(schematizedSurfaceLine);
-
-            Assert.AreEqual(31, schematizedSurfaceLine.Geometry.Count, "Incorrect number of points in surface line");
-
-            Assert.AreEqual(0.0, schematizedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X, tolerance);
-            Assert.AreEqual(1.06, schematizedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).Z, tolerance);
-            Assert.AreEqual(100.0, schematizedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, tolerance);
-            Assert.AreEqual(-0.61, schematizedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, tolerance);
-        }
-
-        /// <summary>
-        /// Check if Import() returns the correct characteristic points.
-        /// </summary>
-        [Test]
         [TestCase(characteristicPointsFilename)] // Ringtoets format
         [TestCase("characteristicpointsDAM.csv")] // Dam format
         public void ImportReturnsCorrectCharacteristicPointsWithoutReadingSurfaceLines(string fileName)
         {
-            var deltaModel = new DeltaModel.DeltaModel();
-            var testDeltaModelFactory = new TestDeltaModelFactory(deltaModel,false);
-
             var fullName = Path.Combine(mapTestData, fileName);
 
 
-            var characteristicPointsImporter = new CharacteristicPointsImporter
-            {
-                FileName = fullName, Factory = testDeltaModelFactory
-            };
-
-            characteristicPointsImporter.Import();
-            Assert.AreEqual(32, deltaModel.SchematizedSurfaceLines.Count, "Read incorrect number of surface lines in import of characteristic points");
-            var schematizedSurfaceLine = deltaModel.SchematizedSurfaceLines.FirstOrDefault(x => x.Name.Equals("dijkring10_dwp36_9"));
+            var characteristicPointsImporter = new CharacteristicPointsImporter();
+            List<SurfaceLine2> surfaceLines = new List<SurfaceLine2>();
+            characteristicPointsImporter.Read(fullName, surfaceLines); //Import();
+            Assert.AreEqual(32, surfaceLines.Count, "Read incorrect number of surface lines in import of characteristic points");
+            var schematizedSurfaceLine = surfaceLines.FirstOrDefault(x => x.Name.Equals("dijkring10_dwp36_9"));
             Assert.IsNotNull(schematizedSurfaceLine);
             Assert.IsEmpty(schematizedSurfaceLine.Geometry.Points);
             Assert.AreEqual(0.0, schematizedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X, tolerance);