Index: Core/Plugins/test/Core.Plugins.Map.Test/Core.Plugins.Map.Test.csproj
===================================================================
diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Core/Plugins/test/Core.Plugins.Map.Test/Core.Plugins.Map.Test.csproj	(.../Core.Plugins.Map.Test.csproj)	(revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Core.Plugins.Map.Test.csproj	(.../Core.Plugins.Map.Test.csproj)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -150,6 +150,10 @@
       <Project>{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}</Project>
       <Name>Core.Components.Gis.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis.IO\Core.Components.Gis.IO.csproj">
+      <Project>{FD264FAD-E6F9-47CC-97CD-770199A8E629}</Project>
+      <Name>Core.Components.Gis.IO</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
       <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
       <Name>Core.Components.Gis</Name>
Index: Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs	(.../MapDataCollectionImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs	(.../MapDataCollectionImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -26,6 +26,7 @@
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.IO.Importers;
 using Core.Plugins.Map.Properties;
 using NUnit.Framework;
 
@@ -101,18 +102,16 @@
         }
 
         [Test]
-        public void CreateFileImporter_ValidInput_SuccessfulImport()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
-            var path = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, "Single_Point_with_ID.shp");
-
             var importTarget = new MapDataCollection("test");
 
             // Call
-            IFileImporter importer = importInfo.CreateFileImporter(importTarget, path);
+            IFileImporter importer = importInfo.CreateFileImporter(importTarget, "");
 
             // Assert
-            Assert.IsTrue(importer.Import());            
+            Assert.IsInstanceOf<FeatureBasedMapDataImporter>(importer);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs	(.../ClosingStructuresContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs	(.../ClosingStructuresContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -39,16 +39,16 @@
     public class ClosingStructuresContextImportInfoTest
     {
         [Test]
-        public void CreateFileImporter_Always_ExpectedPropertiesSet()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
-            assessmentSectionStub.ReferenceLine = new ReferenceLine();
             mocks.ReplayAll();
 
-            var failureMechanism = new ClosingStructuresFailureMechanism();
+            assessmentSectionStub.ReferenceLine = new ReferenceLine();
 
+            var failureMechanism = new ClosingStructuresFailureMechanism();
             var importTarget = new ClosingStructuresContext(failureMechanism.ClosingStructures, failureMechanism, assessmentSectionStub);
 
             using (var plugin = new ClosingStructuresPlugin())
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs	(.../HeightStructuresContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs	(.../HeightStructuresContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -39,17 +39,16 @@
     public class HeightStructuresContextImportInfoTest
     {
         [Test]
-        public void CreateFileImporter_Always_ExpectedPropertiesSet()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
             var mocks = new MockRepository();
-            ReferenceLine referenceLine = mocks.Stub<ReferenceLine>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = referenceLine;
             mocks.ReplayAll();
 
-            var failureMechanism = new HeightStructuresFailureMechanism();
+            assessmentSection.ReferenceLine = new ReferenceLine();
 
+            var failureMechanism = new HeightStructuresFailureMechanism();
             var importTarget = new HeightStructuresContext(failureMechanism.HeightStructures, failureMechanism, assessmentSection);
 
             using (var plugin = new HeightStructuresPlugin())
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs	(.../DikeProfilesContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs	(.../DikeProfilesContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -41,17 +41,16 @@
     public class DikeProfilesContextImportInfoTest
     {
         [Test]
-        public void CreateFileImporter_Always_ExpectedPropertiesSet()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
             var mocks = new MockRepository();
-            ReferenceLine referenceLine = mocks.Stub<ReferenceLine>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = referenceLine;
             mocks.ReplayAll();
 
-            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            assessmentSection.ReferenceLine = new ReferenceLine();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var importTarget = new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, assessmentSection);
 
             using (var plugin = new RingtoetsPlugin())
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs	(.../FailureMechanismSectionsContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs	(.../FailureMechanismSectionsContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -19,23 +19,18 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.IO;
 using Core.Common.Gui;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Common.IO.ReferenceLines;
+using Ringtoets.Common.IO.FileImporters;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ImportInfos
@@ -140,54 +135,24 @@
         }
 
         [Test]
-        public void CreateFileImporter_ValidInput_SuccessfulImport()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
-            var referenceLineFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                                   Path.Combine("ReferenceLine", "traject_1-1.shp"));
-            var sectionsFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                              Path.Combine("FailureMechanismSections", "traject_1-1_vakken.shp"));
-
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var handler = mocks.Stub<IReferenceLineReplaceHandler>();
-            handler.Stub(h => h.ConfirmReplace()).Return(true);
-            handler.Stub(h => h.Replace(Arg<IAssessmentSection>.Is.Same(assessmentSection),
-                                        Arg<ReferenceLine>.Is.NotNull))
-                   .WhenCalled(invocation =>
-                   {
-                       var importedReferenceLine = (ReferenceLine) invocation.Arguments[1];
-                       assessmentSection.ReferenceLine = importedReferenceLine;
-                   })
-                   .Return(Enumerable.Empty<IObservable>());
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
             mocks.ReplayAll();
 
-            var failureMechanism = new Simple();
+            assessmentSection.ReferenceLine = new ReferenceLine();
 
-            var referenceLineImporter = new ReferenceLineImporter(assessmentSection, handler, referenceLineFilePath);
-            referenceLineImporter.Import();
-
             var importTarget = new FailureMechanismSectionsContext(failureMechanism, assessmentSection);
 
             // Call
-            IFileImporter importer = importInfo.CreateFileImporter(importTarget, sectionsFilePath);
+            IFileImporter importer = importInfo.CreateFileImporter(importTarget, "");
 
             // Assert
-            Assert.IsTrue(importer.Import());
+            Assert.IsInstanceOf<FailureMechanismSectionsImporter>(importer);
             mocks.VerifyAll();
         }
-
-        private class Simple : FailureMechanismBase
-        {
-            public Simple() : base("Stubbed name", "Stubbed code") {}
-
-            public override IEnumerable<ICalculation> Calculations
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs	(.../ForeshoreProfilesContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs	(.../ForeshoreProfilesContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -41,16 +41,16 @@
     public class ForeshoreProfilesContextImportInfoTest
     {
         [Test]
-        public void CreateFileImporter_Always_ExpectedPropertiesSet()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
             var mocks = new MockRepository();
-            ReferenceLine referenceLine = mocks.Stub<ReferenceLine>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = referenceLine;
             var failureMechanism = mocks.Stub<IFailureMechanism>();
             mocks.ReplayAll();
 
+            assessmentSection.ReferenceLine = new ReferenceLine();
+
             var list = new ObservableList<ForeshoreProfile>();
 
             var importTarget = new ForeshoreProfilesContext(list, failureMechanism, assessmentSection);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs	(.../ReferenceLineContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs	(.../ReferenceLineContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using Core.Common.Base.IO;
 using Core.Common.Gui;
@@ -30,8 +29,8 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.IO.ReferenceLines;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ImportInfos
@@ -118,25 +117,19 @@
         }
 
         [Test]
-        public void CreateFileImporter_ValidInput_SuccessfulImport()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
-            var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.Stub(section => section.GetFailureMechanisms()).Return(Enumerable.Empty<IFailureMechanism>());
             mocks.ReplayAll();
-
-            var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                  Path.Combine("ReferenceLine", "traject_10-2.shp"));
-
+            
             var importTarget = new ReferenceLineContext(assessmentSection);
 
             // Call
-            IFileImporter importer = importInfo.CreateFileImporter(importTarget, path);
+            IFileImporter importer = importInfo.CreateFileImporter(importTarget, "");
 
             // Assert
-            Assert.IsTrue(importer.Import());
-            mocks.VerifyAll();
+            Assert.IsInstanceOf<ReferenceLineImporter>(importer);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs	(.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs	(.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -20,9 +20,7 @@
 // All rights reserved.
 
 using System.Drawing;
-using System.IO;
 using System.Linq;
-using Core.Common.Base.Geometry;
 using Core.Common.Base.IO;
 using Core.Common.Gui;
 using Core.Common.Gui.Plugin;
@@ -32,6 +30,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
+using Ringtoets.Piping.Plugin.FileImporter;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test.ImportInfos
@@ -140,36 +139,25 @@
         }
 
         [Test]
-        public void CreateFileImporter_ValidInput_SuccessfulImport()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
-            var filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO,
-                                                      Path.Combine("SurfaceLines", "TwoValidSurfaceLines.csv"));
-
-            var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(new[]
-            {
-                new Point2D(3.3, -1),
-                new Point2D(3.3, 1),
-                new Point2D(94270, 427775.65),
-                new Point2D(94270, 427812.08)
-            });
-
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = referenceLine;
             mocks.ReplayAll();
 
+            assessmentSection.ReferenceLine = new ReferenceLine();
+
             var failureMechanism = new PipingFailureMechanism();
             var surfaceLines = new RingtoetsPipingSurfaceLineCollection();
 
             var importTarget = new RingtoetsPipingSurfaceLinesContext(surfaceLines, failureMechanism, assessmentSection);
 
             // Call
-            IFileImporter importer = importInfo.CreateFileImporter(importTarget, filePath);
+            IFileImporter importer = importInfo.CreateFileImporter(importTarget, "'");
 
             // Assert
-            Assert.IsTrue(importer.Import());
+            Assert.IsInstanceOf<PipingSurfaceLinesCsvImporter>(importer);
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs	(.../StochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs	(.../StochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -20,9 +20,7 @@
 // All rights reserved.
 
 using System.Drawing;
-using System.IO;
 using System.Linq;
-using Core.Common.Base.Geometry;
 using Core.Common.Base.IO;
 using Core.Common.Gui;
 using Core.Common.Gui.Plugin;
@@ -32,6 +30,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
+using Ringtoets.Piping.IO.Importers;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test.ImportInfos
@@ -141,32 +140,21 @@
         public void CreateFileImporter_ValidInput_SuccessfulImport()
         {
             // Setup
-            var filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO,
-                                                      Path.Combine("PipingSoilProfilesReader", "complete.soil"));
-
-            var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(new[]
-            {
-                new Point2D(3.3, -1),
-                new Point2D(3.3, 1),
-                new Point2D(94270, 427775.65),
-                new Point2D(94270, 427812.08)
-            });
-
             var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = referenceLine;
+            var assessmentSection = mocks.Stub<IAssessmentSection>();            
             mocks.ReplayAll();
 
+            assessmentSection.ReferenceLine = new ReferenceLine();
+
             var failureMechanism = new PipingFailureMechanism();
 
             var importTarget = new StochasticSoilModelCollectionContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection);
 
             // Call
-            IFileImporter importer = importInfo.CreateFileImporter(importTarget, filePath);
+            IFileImporter importer = importInfo.CreateFileImporter(importTarget, "");
 
             // Assert
-            Assert.IsTrue(importer.Import());
+            Assert.IsInstanceOf<StochasticSoilModelImporter>(importer);
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r071888c2752e0deb69682e9d685a6f9ba2e75742
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs	(.../StabilityPointStructuresContextImportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs	(.../StabilityPointStructuresContextImportInfoTest.cs)	(revision 071888c2752e0deb69682e9d685a6f9ba2e75742)
@@ -39,14 +39,15 @@
     public class StabilityPointStructuresContextImportInfoTest
     {
         [Test]
-        public void CreateFileImporter_Always_ExpectedPropertiesSet()
+        public void CreateFileImporter_Always_ReturnFileImporter()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = new ReferenceLine();
             mocks.ReplayAll();
 
+            assessmentSection.ReferenceLine = new ReferenceLine();
+
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             var importTarget = new StabilityPointStructuresContext(failureMechanism.StabilityPointStructures,