Index: src/Deltares.Geotechnics.IO.Tests/SegmentsImporterTest.cs
===================================================================
diff -u -r14 -r53
--- src/Deltares.Geotechnics.IO.Tests/SegmentsImporterTest.cs	(.../SegmentsImporterTest.cs)	(revision 14)
+++ src/Deltares.Geotechnics.IO.Tests/SegmentsImporterTest.cs	(.../SegmentsImporterTest.cs)	(revision 53)
@@ -2,12 +2,9 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Deltares.DeltaModel;
 using Deltares.Geotechnics.IO.Importers;
 using Deltares.Geotechnics.Mechanisms;
-using Deltares.Standard.IO;
 using Deltares.Standard.Language;
-using Deltares.Standard.TestUtils;
 using NUnit.Framework;
 
 namespace Deltares.Geotechnics.IO.Tests
@@ -30,78 +27,28 @@
 
             // setup importer, not using factory
             var importer = new SoilSegmentsImporter();
-            var soilProfiles = new List<SoilProfile>();
-            soilProfiles.Add(new SoilProfile1D { Name = "Dummy1D"});
-            soilProfiles.Add(new SoilProfile2D { Name = "Dummy2D" });
+            var soilProfiles = new List<SoilProfile>
+            {
+                new SoilProfile1D
+                {
+                    Name = "Dummy1D"
+                },
+                new SoilProfile2D
+                {
+                    Name = "Dummy2D"
+                }
+            };
 
             // error messages are returned as list of strings, which are to be logged etc. by the application
             Assert.AreEqual(0, importer.ErrorMessages.Count);
-            var segments = importer.ReadSoilSegments(testFile, soilProfiles);
+            importer.ReadSoilSegments(testFile, soilProfiles);
             Assert.Greater(importer.ErrorMessages.Count, 0);
             Assert.NotNull(importer.ErrorMessages.FirstOrDefault(m => m.Message.Contains(
                 LocalizationManager.GetTranslatedText(typeof(SoilSegmentsImporter), "SegmentsCsvFileEmptyWarning").Replace("{0}",""))));
 
             File.Delete(testFile);
         }
 
-        [Test]
-        public void ImportSoilProfilesAndSegmentsFromCsvFiles()
-        {
-            const string segmentfile = "segments.csv";
-            const string soilprofilefile = "soilprofiles.csv";
-            var dir =  @"..\..\..\data\Dam\Waterboards\Delfland\regionaal\csv files\";
-
-            var deltaModel = new DeltaModel.DeltaModel();
-            var deltaModelFactory = new DeltaModelFactory(deltaModel);
-            var multiImporter = new MultiImporter();
-
-            var profileImporter = new SoilProfilesImporter
-                {
-                    FileName = dir + soilprofilefile, Factory = deltaModelFactory
-                };
-            multiImporter.Importers.Add(profileImporter);
-
-            var segmentsImporter = new SoilSegmentsImporter
-                {
-                    FileName = dir + segmentfile, Factory = deltaModelFactory
-                };
-            multiImporter.Importers.Add(segmentsImporter);
-
-            multiImporter.DataFactory = deltaModelFactory;
-            multiImporter.ImportAll(null);
-
-            checkProfiles(deltaModel);
-        }
-
-        [Test]
-        public void ImportSoilProfilesAndSegmentsFromCsvFilesChangedOrder()
-        {
-            const string segmentfile = "segments.csv";
-            const string soilprofilefile = "soilprofiles.csv";
-            var dir = @"..\..\..\data\Dam\Waterboards\Delfland\regionaal\csv files\";
-
-            var deltaModel = new DeltaModel.DeltaModel();
-            var deltaModelFactory = new DeltaModelFactory(deltaModel);
-            var multiImporter = new MultiImporter();
-
-            var segmentsImporter = new SoilSegmentsImporter
-                {
-                    FileName = dir + segmentfile, Factory = deltaModelFactory
-                };
-            multiImporter.Importers.Add(segmentsImporter);
-
-            var profileImporter = new SoilProfilesImporter
-                {
-                    FileName = dir + soilprofilefile, Factory = deltaModelFactory
-                };
-            multiImporter.Importers.Add(profileImporter);
-
-            multiImporter.DataFactory = deltaModelFactory;
-            multiImporter.ImportAll(null);
-
-            checkProfiles(deltaModel);
-        }
-
         /// <summary>
         /// Test the read methods used in D-SoilModel
         /// </summary>
@@ -112,31 +59,29 @@
             const string soilprofilefile = "soilprofiles.csv";
             var dir = @"..\..\..\data\Dam\Waterboards\Delfland\regionaal\csv files\";
 
-            var deltaModel = new DeltaModel.DeltaModel();
+            var soils = new SoilList();
             var importer = new SoilProfilesImporter();
-            var profiles = importer.ReadSoilProfiles(dir + soilprofilefile, deltaModel.Soils);
+            var profiles = importer.ReadSoilProfiles(dir + soilprofilefile, soils);
             var segmentsImporter = new SoilSegmentsImporter();
-            var segments = segmentsImporter.ReadSoilSegments(dir + segmentfile, new List<SoilProfile>(profiles));
-
-            deltaModel.SoilProfiles1D.AddRange(profiles);
-            deltaModel.SoilSegments.AddRange(segments);
-            checkProfiles(deltaModel);
+            var profilesList = new List<SoilProfile>(profiles);
+            var segments = segmentsImporter.ReadSoilSegments(dir + segmentfile, profilesList);
+            
+            checkProfiles(segments);
         }
 
-        private void checkProfiles(DeltaModel.DeltaModel deltaModel)
+        private void checkProfiles(List<SoilSegment> segments)
         {
-            //Assert.AreEqual(deltaModel.SoilProfiles1D.Count, 147);
-            Assert.AreEqual(deltaModel.SoilSegments.Count, 10);
-            Assert.AreEqual(deltaModel.SoilSegments.Count(s => s.Mechanism == Mechanism.Piping), 5);
-            Assert.AreEqual(deltaModel.SoilSegments.Count(s => s.Mechanism == Mechanism.Stability), 5);
-            Assert.AreEqual(deltaModel.SoilSegments.Count(s => s.SegmentId == "1"), 2);
-            Assert.AreEqual(deltaModel.SoilSegments.Count(s => s.SegmentId == "2"), 2);
-            Assert.AreEqual(deltaModel.SoilSegments.Count(s => s.SegmentId == "3"), 2);
-            Assert.AreEqual(deltaModel.SoilSegments.Count(s => s.SegmentId == "4"), 2);
-            Assert.AreEqual(deltaModel.SoilSegments.Count(s => s.SegmentId == "5"), 2);
+            Assert.AreEqual(segments.Count, 10);
+            Assert.AreEqual(segments.Count(s => s.Mechanism == Mechanism.Piping), 5);
+            Assert.AreEqual(segments.Count(s => s.Mechanism == Mechanism.Stability), 5);
+            Assert.AreEqual(segments.Count(s => s.SegmentId == "1"), 2);
+            Assert.AreEqual(segments.Count(s => s.SegmentId == "2"), 2);
+            Assert.AreEqual(segments.Count(s => s.SegmentId == "3"), 2);
+            Assert.AreEqual(segments.Count(s => s.SegmentId == "4"), 2);
+            Assert.AreEqual(segments.Count(s => s.SegmentId == "5"), 2);
 
             // check sum of probabilities
-            foreach (var segment in deltaModel.SoilSegments)
+            foreach (var segment in segments)
             {
                 double probability = 0;
                 foreach (var profile in segment.StochasticSoilModel.StochasticSoilProfiles)
@@ -147,7 +92,7 @@
             }
 
             // check that all soilprofiles (1D) are assigned a value
-            foreach (var segment in deltaModel.SoilSegments)
+            foreach (var segment in segments)
             {
                 foreach (var profile in segment.StochasticSoilModel.StochasticSoilProfiles)
                 {