Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj
===================================================================
diff -u -r050f90d86c3b1cb918422bb20e6dd51c0d879170 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj)	(revision 050f90d86c3b1cb918422bb20e6dd51c0d879170)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -38,6 +38,10 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -57,6 +61,7 @@
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/packages.config
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/packages.config	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/packages.config	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<packages>
+  <package id="NUnit" version="3.7.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj
===================================================================
diff -u -r6a5a5c3c47792446311ea872b8626382aecaad11 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj	(.../Ringtoets.Piping.Data.Test.csproj)	(revision 6a5a5c3c47792446311ea872b8626382aecaad11)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj	(.../Ringtoets.Piping.Data.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -120,6 +120,10 @@
       <Project>{27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8}</Project>
       <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs
===================================================================
diff -u -r4d2b702d8a5e4570ee53fa499f8f5fa196acdb98 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs	(.../PipingStochasticSoilModelTest.cs)	(revision 4d2b702d8a5e4570ee53fa499f8f5fa196acdb98)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs	(.../PipingStochasticSoilModelTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -26,8 +26,8 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Data.Test.SoilProfile
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs
===================================================================
diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs	(.../PipingStochasticSoilProfileTest.cs)	(revision 09693d79085118c47709b7059ab7c1ef459ad2aa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs	(.../PipingStochasticSoilProfileTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -25,8 +25,8 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Data.Test.SoilProfile
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingStochasticSoilModelTestFactory.cs
===================================================================
diff -u -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingStochasticSoilModelTestFactory.cs	(.../PipingStochasticSoilModelTestFactory.cs)	(revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingStochasticSoilModelTestFactory.cs	(.../PipingStochasticSoilModelTestFactory.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Data.TestUtil
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -ra7250eadfcaa33555a923aac13f3ac00c0a12e1f -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision a7250eadfcaa33555a923aac13f3ac00c0a12e1f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -30,6 +30,7 @@
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Data.TestUtil
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj
===================================================================
diff -u -ra7250eadfcaa33555a923aac13f3ac00c0a12e1f -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj	(.../Ringtoets.Piping.Data.TestUtil.csproj)	(revision a7250eadfcaa33555a923aac13f3ac00c0a12e1f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj	(.../Ringtoets.Piping.Data.TestUtil.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -99,6 +99,10 @@
       <Project>{27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8}</Project>
       <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -r443600a37b8249cc44c134216fa98eed7a5bfa49 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 443600a37b8249cc44c134216fa98eed7a5bfa49)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -43,8 +43,8 @@
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilModelPropertiesTest.cs
===================================================================
diff -u -r7b513e5e4b0d15ba13e161b4c5a2e1097f58b8fd -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilModelPropertiesTest.cs	(.../PipingStochasticSoilModelPropertiesTest.cs)	(revision 7b513e5e4b0d15ba13e161b4c5a2e1097f58b8fd)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilModelPropertiesTest.cs	(.../PipingStochasticSoilModelPropertiesTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Forms.PropertyClasses;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs
===================================================================
diff -u -rdf2e12d126cb444405f853a294d21f1873147a34 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs	(.../PipingStochasticSoilProfilePropertiesTest.cs)	(revision df2e12d126cb444405f853a294d21f1873147a34)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs	(.../PipingStochasticSoilProfilePropertiesTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -28,8 +28,8 @@
 using NUnit.Framework;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Forms.PropertyClasses;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Forms.Test.PropertyClasses
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -rd04fe66045d6183879fd4e70bab196d127039350 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision d04fe66045d6183879fd4e70bab196d127039350)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -189,6 +189,10 @@
       <Project>{955e574d-67ce-4347-aa6b-7df8a04ed754}</Project>
       <Name>Ringtoets.Piping.Data.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs	(.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs	(.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -35,8 +35,8 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;
 using Ringtoets.Piping.Forms.UITypeEditors;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Forms.Test.UITypeEditors
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs	(.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs	(.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -35,8 +35,8 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;
 using Ringtoets.Piping.Forms.UITypeEditors;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Forms.Test.UITypeEditors
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -37,6 +37,7 @@
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Forms.Test.Views
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -r08dff03b25288c1b1614c2b9486430ec22425933 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 08dff03b25288c1b1614c2b9486430ec22425933)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -42,6 +42,7 @@
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Forms.Test.Views
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj
===================================================================
diff -u -rdaa6b36fc2506683c50ba4117790452ae4f45d7f -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision daa6b36fc2506683c50ba4117790452ae4f45d7f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -57,7 +57,6 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
@@ -121,9 +120,9 @@
       <Project>{955E574D-67CE-4347-AA6B-7DF8A04ED754}</Project>
       <Name>Ringtoets.Piping.Data.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Ringtoets.Piping.KernelWrapper.TestUtil\Ringtoets.Piping.KernelWrapper.TestUtil.csproj">
-      <Project>{27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8}</Project>
-      <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>
+    <ProjectReference Include="..\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilProfileTransformerTest.cs
===================================================================
diff -u -rdaa6b36fc2506683c50ba4117790452ae4f45d7f -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilProfileTransformerTest.cs	(.../PipingStochasticSoilProfileTransformerTest.cs)	(revision daa6b36fc2506683c50ba4117790452ae4f45d7f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilProfileTransformerTest.cs	(.../PipingStochasticSoilProfileTransformerTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -25,8 +25,8 @@
 using Ringtoets.Common.IO.SoilProfile;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.IO.SoilProfiles;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.IO.Test.SoilProfiles
 {
Fisheye: Tag 6cf604a94300560817de70fd42d09baa5b22c3a6 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/PipingSoilProfileTestFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj
===================================================================
diff -u -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj)	(revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -51,7 +51,6 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="PipingSoilProfileTestFactoryTest.cs" />
     <Compile Include="SubCalculator\PipingProfilePropertyCalculatorStubTest.cs" />
     <Compile Include="SubCalculator\PipingSubCalculatorFactoryConfigTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -68,18 +67,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Piping.KernelWrapper\Ringtoets.Piping.KernelWrapper.csproj">
       <Project>{D64E4F0E-E341-496F-82B2-941AD202B4E3}</Project>
       <Name>Ringtoets.Piping.KernelWrapper</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Ringtoets.Piping.Primitives\Ringtoets.Piping.Primitives.csproj">
-      <Project>{14c6f716-64e2-4bc4-a1ef-05865fcefa4c}</Project>
-      <Name>Ringtoets.Piping.Primitives</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.Piping.KernelWrapper.TestUtil\Ringtoets.Piping.KernelWrapper.TestUtil.csproj">
       <Project>{27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8}</Project>
       <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>
Fisheye: Tag 6cf604a94300560817de70fd42d09baa5b22c3a6 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/PipingSoilProfileTestFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj	(.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj)	(revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj	(.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -51,7 +51,6 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="PipingSoilProfileTestFactory.cs" />
     <Compile Include="SubCalculator\PipingProfilePropertyCalculatorStub.cs" />
     <Compile Include="SubCalculator\PipingSubCalculatorFactoryConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -80,10 +79,6 @@
       <Project>{d64e4f0e-e341-496f-82b2-941ad202b4e3}</Project>
       <Name>Ringtoets.Piping.KernelWrapper</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Ringtoets.Piping.Primitives\Ringtoets.Piping.Primitives.csproj">
-      <Project>{14C6F716-64E2-4BC4-A1EF-05865FCEFA4C}</Project>
-      <Name>Ringtoets.Piping.Primitives</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs	(.../PipingStochasticSoilModelUpdateDataStrategyTest.cs)	(revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs	(.../PipingStochasticSoilModelUpdateDataStrategyTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -30,9 +30,9 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Data.TestUtil;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Plugin.FileImporter;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Plugin.Test.FileImporter
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs	(.../PipingSurfaceLineUpdateDataStrategyTest.cs)	(revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs	(.../PipingSurfaceLineUpdateDataStrategyTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -36,6 +36,7 @@
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Plugin.FileImporter;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Plugin.Test.FileImporter
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilProfilePropertyInfoTest.cs
===================================================================
diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilProfilePropertyInfoTest.cs	(.../PipingStochasticSoilProfilePropertyInfoTest.cs)	(revision 09693d79085118c47709b7059ab7c1ef459ad2aa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingStochasticSoilProfilePropertyInfoTest.cs	(.../PipingStochasticSoilProfilePropertyInfoTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -25,7 +25,7 @@
 using NUnit.Framework;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Forms.PropertyClasses;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Plugin.Test.PropertyInfos
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj
===================================================================
diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision 09693d79085118c47709b7059ab7c1ef459ad2aa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -191,6 +191,10 @@
       <Project>{27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8}</Project>
       <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7947681ebba776d55c4f78782360256800fa5d1f -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 7947681ebba776d55c4f78782360256800fa5d1f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -49,6 +49,7 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs
===================================================================
diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision 09693d79085118c47709b7059ab7c1ef459ad2aa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -32,7 +32,7 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test.TreeNodeInfos
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelTreeNodeInfoTest.cs
===================================================================
diff -u -r42357a100d1a75baca233aa44b866a5009f48e00 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelTreeNodeInfoTest.cs	(.../PipingStochasticSoilModelTreeNodeInfoTest.cs)	(revision 42357a100d1a75baca233aa44b866a5009f48e00)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelTreeNodeInfoTest.cs	(.../PipingStochasticSoilModelTreeNodeInfoTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Piping.Data.SoilProfile;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test.TreeNodeInfos
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilProfileTreeNodeInfoTest.cs
===================================================================
diff -u -r42357a100d1a75baca233aa44b866a5009f48e00 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilProfileTreeNodeInfoTest.cs	(.../PipingStochasticSoilProfileTreeNodeInfoTest.cs)	(revision 42357a100d1a75baca233aa44b866a5009f48e00)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilProfileTreeNodeInfoTest.cs	(.../PipingStochasticSoilProfileTreeNodeInfoTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -29,7 +29,7 @@
 using Rhino.Mocks;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Forms.Properties;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Plugin.Test.TreeNodeInfos
 {
@@ -94,7 +94,7 @@
         [Test]
         public void Image_Always_ReturnsSetImage()
         {
-          // Call
+            // Call
             Image image = info.Image(null);
 
             // Assert
Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/PipingSoilProfileTestFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/PipingSoilProfileTestFactoryTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/PipingSoilProfileTestFactoryTest.cs	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -0,0 +1,100 @@
+// 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.
+
+using System;
+using System.Linq;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+
+namespace Ringtoets.Piping.Primitives.TestUtil.Test
+{
+    [TestFixture]
+    public class PipingSoilProfileTestFactoryTest
+    {
+        [Test]
+        public void CreatePipingSoilProfile_ReturnsPipingSoilProfile()
+        {
+            // Call
+            PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
+
+            // Assert
+            Assert.AreEqual("name", soilProfile.Name);
+            Assert.AreEqual(0, soilProfile.Bottom);
+            Assert.AreEqual(SoilProfileType.SoilProfile1D, soilProfile.SoilProfileSourceType);
+
+            var expectedLayer = new PipingSoilLayer(1.0);
+            Assert.AreEqual(1, soilProfile.Layers.Count());
+            AssertAreEqual(expectedLayer, soilProfile.Layers.Single());
+        }
+
+        [Test]
+        public void CreatePipingSoilProfileWithName_ReturnsPipingSoilProfile()
+        {
+            // Setup
+            const string name = "Some name";
+
+            // Call
+            PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(name);
+
+            // Assert
+            Assert.AreEqual(name, soilProfile.Name);
+            Assert.AreEqual(0, soilProfile.Bottom);
+            Assert.AreEqual(SoilProfileType.SoilProfile1D, soilProfile.SoilProfileSourceType);
+
+            var expectedLayer = new PipingSoilLayer(1.0);
+            Assert.AreEqual(1, soilProfile.Layers.Count());
+            AssertAreEqual(expectedLayer, soilProfile.Layers.Single());
+        }
+
+        [Test]
+        public void CreatePipingSoilProfileWithNameAndType_ReturnsPipingSoilProfile()
+        {
+            // Setup
+            const string name = "Some name";
+            var type = new Random(123).NextEnumValue<SoilProfileType>();
+
+            // Call
+            PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile(name, type);
+
+            // Assert
+            Assert.AreEqual(name, soilProfile.Name);
+            Assert.AreEqual(0, soilProfile.Bottom);
+            Assert.AreEqual(type, soilProfile.SoilProfileSourceType);
+
+            var expectedLayer = new PipingSoilLayer(1.0);
+            Assert.AreEqual(1, soilProfile.Layers.Count());
+            AssertAreEqual(expectedLayer, soilProfile.Layers.Single());
+        }
+
+        private static void AssertAreEqual(PipingSoilLayer expected, PipingSoilLayer actual)
+        {
+            Assert.AreEqual(expected.Top, actual.Top);
+            Assert.AreEqual(expected.MaterialName, actual.MaterialName);
+            Assert.AreEqual(expected.BelowPhreaticLevelMean, actual.BelowPhreaticLevelMean);
+            Assert.AreEqual(expected.BelowPhreaticLevelDeviation, actual.BelowPhreaticLevelDeviation);
+            Assert.AreEqual(expected.BelowPhreaticLevelShift, actual.BelowPhreaticLevelShift);
+            Assert.AreEqual(expected.DiameterD70Mean, actual.DiameterD70Mean);
+            Assert.AreEqual(expected.DiameterD70CoefficientOfVariation, actual.DiameterD70CoefficientOfVariation);
+            Assert.AreEqual(expected.PermeabilityMean, actual.PermeabilityMean);
+            Assert.AreEqual(expected.PermeabilityCoefficientOfVariation, actual.PermeabilityCoefficientOfVariation);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/Ringtoets.Piping.Primitives.TestUtil.Test.csproj
===================================================================
diff -u -r050f90d86c3b1cb918422bb20e6dd51c0d879170 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/Ringtoets.Piping.Primitives.TestUtil.Test.csproj	(.../Ringtoets.Piping.Primitives.TestUtil.Test.csproj)	(revision 050f90d86c3b1cb918422bb20e6dd51c0d879170)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/Ringtoets.Piping.Primitives.TestUtil.Test.csproj	(.../Ringtoets.Piping.Primitives.TestUtil.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -38,26 +38,41 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PipingSoilProfileTestFactoryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.Piping.Primitives\Ringtoets.Piping.Primitives.csproj">
+      <Project>{14C6F716-64E2-4BC4-A1EF-05865FCEFA4C}</Project>
+      <Name>Ringtoets.Piping.Primitives</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/packages.config
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/packages.config	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/packages.config	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<packages>
+  <package id="NUnit" version="3.7.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -0,0 +1,86 @@
+// 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.Primitives.TestUtil
+{
+    /// <summary>
+    /// Factory to create simple <see cref="PipingSoilProfile"/> instances that can be used for testing.
+    /// </summary>
+    public static class PipingSoilProfileTestFactory
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PipingSoilProfile"/>, which has:
+        /// <list type="bullet">
+        /// <item><see cref="PipingSoilProfile.Name"/> set to <paramref name="name"/>;</item>
+        /// <item><see cref="PipingSoilProfile.Bottom"/> set to <c>0.0</c>;</item>
+        /// <item><see cref="PipingSoilProfile.Layers"/> set to a collection with a single <see cref="Ringtoets.Piping.Primitives.PipingSoilLayer"/>
+        /// with <see cref="PipingSoilLayer.Top"/> set to <c>0.0</c>;</item>
+        /// <item><see cref="PipingSoilProfile.SoilProfileSourceType"/> set to <see cref="Ringtoets.Piping.Primitives.SoilProfileType.SoilProfile1D"/>.</item>
+        /// </list>
+        /// </summary>
+        /// <param name="name">The name to set for the <see cref="PipingSoilProfile"/>.</param>
+        /// <returns>The created <see cref="PipingSoilProfile"/>.</returns>
+        public static PipingSoilProfile CreatePipingSoilProfile(string name)
+        {
+            return CreatePipingSoilProfile(name, SoilProfileType.SoilProfile1D);
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="PipingSoilProfile"/>, which has:
+        /// <list type="bullet">
+        /// <item><see cref="PipingSoilProfile.Name"/> set to "name";</item>
+        /// <item><see cref="PipingSoilProfile.Bottom"/> set to <c>0.0</c>;</item>
+        /// <item><see cref="PipingSoilProfile.Layers"/> set to a collection with a single <see cref="Ringtoets.Piping.Primitives.PipingSoilLayer"/>
+        /// with <see cref="PipingSoilLayer.Top"/> set to <c>0.0</c>;</item>
+        /// <item><see cref="PipingSoilProfile.SoilProfileSourceType"/> set to <see cref="Ringtoets.Piping.Primitives.SoilProfileType.SoilProfile1D"/>.</item>
+        /// </list>
+        /// </summary>
+        /// <returns>The created <see cref="PipingSoilProfile"/>.</returns>
+        public static PipingSoilProfile CreatePipingSoilProfile()
+        {
+            return CreatePipingSoilProfile("name");
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="PipingSoilProfile"/> that has:
+        /// <list type="bullet">
+        /// <item><see cref="PipingSoilProfile.Name"/> set to <paramref name="name"/>;</item>
+        /// <item><see cref="PipingSoilProfile.Bottom"/> set to <c>0.0</c>;</item>
+        /// <item><see cref="PipingSoilProfile.Layers"/> set to a collection with a single <see cref="Ringtoets.Piping.Primitives.PipingSoilLayer"/>
+        /// with <see cref="PipingSoilLayer.Top"/> set to <c>0.0</c>;</item>
+        /// <item><see cref="PipingSoilProfile.SoilProfileSourceType"/> set to <paramref name="soilProfileType"/>.</item>
+        /// </list>
+        /// </summary>
+        /// <param name="name">The name for the profile.</param>
+        /// <param name="soilProfileType">The type of the profile.</param>
+        /// <returns>The created <see cref="PipingSoilProfile"/>.</returns>
+        public static PipingSoilProfile CreatePipingSoilProfile(string name, SoilProfileType soilProfileType)
+        {
+            return new PipingSoilProfile(name, 0.0, new[]
+            {
+                new PipingSoilLayer(1.0)
+                {
+                    IsAquifer = true
+                }
+            }, soilProfileType);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/Ringtoets.Piping.Primitives.TestUtil.csproj
===================================================================
diff -u -r050f90d86c3b1cb918422bb20e6dd51c0d879170 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/Ringtoets.Piping.Primitives.TestUtil.csproj	(.../Ringtoets.Piping.Primitives.TestUtil.csproj)	(revision 050f90d86c3b1cb918422bb20e6dd51c0d879170)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/Ringtoets.Piping.Primitives.TestUtil.csproj	(.../Ringtoets.Piping.Primitives.TestUtil.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -40,24 +40,26 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PipingSoilProfileTestFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Ringtoets.Piping.Primitives\Ringtoets.Piping.Primitives.csproj">
+      <Project>{14C6F716-64E2-4BC4-A1EF-05865FCEFA4C}</Project>
+      <Name>Ringtoets.Piping.Primitives</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -31,6 +31,7 @@
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Service.Test
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingInputServiceTest.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingInputServiceTest.cs	(.../PipingInputServiceTest.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingInputServiceTest.cs	(.../PipingInputServiceTest.cs)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -23,7 +23,7 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Data.TestUtil;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
+using Ringtoets.Piping.Primitives.TestUtil;
 
 namespace Ringtoets.Piping.Service.Test
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj
===================================================================
diff -u -r7b7bd75dc1c1327386c9be96b5d480565bb8ecd6 -r6cf604a94300560817de70fd42d09baa5b22c3a6
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj	(.../Ringtoets.Piping.Service.Test.csproj)	(revision 7b7bd75dc1c1327386c9be96b5d480565bb8ecd6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj	(.../Ringtoets.Piping.Service.Test.csproj)	(revision 6cf604a94300560817de70fd42d09baa5b22c3a6)
@@ -113,6 +113,10 @@
       <Project>{955e574d-67ce-4347-aa6b-7df8a04ed754}</Project>
       <Name>Ringtoets.Piping.Data.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj">
+      <Project>{6F568E38-592A-4F99-A901-86B74C4F24D2}</Project>
+      <Name>Ringtoets.Piping.Primitives.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">