Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -318,6 +318,10 @@
       <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Ringtoets\Piping\test\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87c2c553-c0bc-40bf-b1ea-b83bff357f27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -38,8 +38,8 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -31,8 +31,9 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Application.Ringtoets.Storage.Test.Create.Piping
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs	(.../PipingSoilProfileCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs	(.../PipingSoilProfileCreateExtensionsTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -24,8 +24,8 @@
 using Application.Ringtoets.Storage.Create.Piping;
 using Application.Ringtoets.Storage.DbContext;
 using NUnit.Framework;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Application.Ringtoets.Storage.Test.Create.Piping
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs	(.../PipingStochasticSoilModelCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs	(.../PipingStochasticSoilModelCreateExtensionsTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Data.TestUtil;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Application.Ringtoets.Storage.Test.Create.Piping
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs	(.../PipingStochasticSoilProfileCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs	(.../PipingStochasticSoilProfileCreateExtensionsTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -25,8 +25,8 @@
 using Application.Ringtoets.Storage.DbContext;
 using NUnit.Framework;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Application.Ringtoets.Storage.Test.Create.Piping
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -31,8 +31,8 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Application.Ringtoets.Storage.Test.Read.Piping
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -37,8 +37,8 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj
===================================================================
diff -u -r7b7bd75dc1c1327386c9be96b5d480565bb8ecd6 -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision 7b7bd75dc1c1327386c9be96b5d480565bb8ecd6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -108,6 +108,14 @@
       <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Ringtoets\Piping\test\Ringtoets.Piping.Data.TestUtil\Ringtoets.Piping.Data.TestUtil.csproj">
+      <Project>{955E574D-67CE-4347-AA6B-7DF8A04ED754}</Project>
+      <Name>Ringtoets.Piping.Data.TestUtil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Ringtoets\Piping\test\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87C2C553-C0BC-40BF-B1EA-B83BFF357F27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -rfa42997d06603fbf18a0f44a08f801230e9180cc -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision fa42997d06603fbf18a0f44a08f801230e9180cc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -47,8 +47,9 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
@@ -642,7 +643,6 @@
                         },
                         Output = new StructuresOutput(new ProbabilityAssessmentOutput(0.8, 0.95, 0.10, 0.11, 0.12), null)
                     },
-
                     new StructuresCalculation<ClosingStructuresInput>
                     {
                         InputParameters =
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj
===================================================================
diff -u -r6cf604a94300560817de70fd42d09baa5b22c3a6 -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj	(.../Ringtoets.Piping.Data.TestUtil.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj	(.../Ringtoets.Piping.Data.TestUtil.csproj)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -59,6 +59,7 @@
     <Compile Include="Segment2DLoopCollectionHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestPipingFailureMechanism.cs" />
+    <Compile Include="TestPipingOutput.cs" />
     <Compile Include="TestPipingSemiProbabilisticOutput.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingOutput.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingOutput.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingOutput.cs	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.Piping.Data.TestUtil
+{
+    /// <summary>
+    /// A <see cref="PipingOutput"/> configured to be used immediately for testing purposes.
+    /// </summary>
+    /// <seealso cref="Ringtoets.Piping.Data.PipingOutput" />
+    public class TestPipingOutput : PipingOutput
+    {
+        /// <summary>
+        /// Creates a new instance of the <see cref="TestPipingOutput"/> class.
+        /// </summary>
+        public TestPipingOutput() : base(new ConstructionProperties
+        {
+            HeaveZValue = 1.1,
+            HeaveFactorOfSafety = 1.50,
+            UpliftEffectiveStress = 3.51,
+            UpliftZValue = 6.51,
+            UpliftFactorOfSafety = 3.75,
+            SellmeijerZValue = 8.92,
+            SellmeijerFactorOfSafety = 6.3,
+            HeaveGradient = 8.4,
+            SellmeijerCreepCoefficient = 9.9,
+            SellmeijerCriticalFall = 4.1,
+            SellmeijerReducedFall = 2.21
+        }) {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs	(.../PipingOutputContextPropertiesTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs	(.../PipingOutputContextPropertiesTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -26,6 +26,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -r6cf604a94300560817de70fd42d09baa5b22c3a6 -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj	(.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj	(.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -60,7 +60,6 @@
     <Compile Include="SubCalculator\SellmeijerCalculatorStub.cs" />
     <Compile Include="SubCalculator\TestPipingSubCalculatorFactory.cs" />
     <Compile Include="SubCalculator\UpliftCalculatorStub.cs" />
-    <Compile Include="TestPipingOutput.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
Fisheye: Tag b0b8bffcbb871a42e6c8b282fe20858d6a738dbc refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingOutput.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 09693d79085118c47709b7059ab7c1ef459ad2aa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -35,8 +35,8 @@
 using Ringtoets.Common.IO.SoilProfile;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test.ImportInfos
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -raa49537188229065df91b1a931f088c32115702a -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs	(.../PipingSurfaceLinesContextImportInfoTest.cs)	(revision aa49537188229065df91b1a931f088c32115702a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs	(.../PipingSurfaceLinesContextImportInfoTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -34,8 +34,8 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.IO.SurfaceLines;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
@@ -47,17 +47,6 @@
         private ImportInfo importInfo;
         private PipingPlugin plugin;
 
-        public override void Setup()
-        {
-            plugin = new PipingPlugin();
-            importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(PipingSurfaceLinesContext));
-        }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-        }
-
         [Test]
         public void Name_Always_ReturnExpectedName()
         {
@@ -246,5 +235,16 @@
             Assert.IsInstanceOf<SurfaceLinesCsvImporter<PipingSurfaceLine>>(importer);
             mocks.VerifyAll();
         }
+
+        public override void Setup()
+        {
+            plugin = new PipingPlugin();
+            importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(PipingSurfaceLinesContext));
+        }
+
+        public override void TearDown()
+        {
+            plugin.Dispose();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs	(.../PipingSurfaceLinesContextUpdateInfoTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs	(.../PipingSurfaceLinesContextUpdateInfoTest.cs)	(revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc)
@@ -33,8 +33,8 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.IO.SurfaceLines;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
@@ -46,17 +46,6 @@
         private UpdateInfo updateInfo;
         private PipingPlugin plugin;
 
-        public override void Setup()
-        {
-            plugin = new PipingPlugin();
-            updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(PipingSurfaceLinesContext));
-        }
-
-        public override void TearDown()
-        {
-            plugin.Dispose();
-        }
-
         [Test]
         public void Name_Always_ReturnExpectedName()
         {
@@ -271,5 +260,16 @@
             Assert.IsInstanceOf<SurfaceLinesCsvImporter<PipingSurfaceLine>>(importer);
             mocks.VerifyAll();
         }
+
+        public override void Setup()
+        {
+            plugin = new PipingPlugin();
+            updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(PipingSurfaceLinesContext));
+        }
+
+        public override void TearDown()
+        {
+            plugin.Dispose();
+        }
     }
 }
\ No newline at end of file