Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj
===================================================================
diff -u -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj	(.../Ringtoets.Integration.TestUtils.Test.csproj)	(revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj	(.../Ringtoets.Integration.TestUtils.Test.csproj)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -101,14 +101,10 @@
       <Project>{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}</Project>
       <Name>Ringtoets.Piping.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Piping\src\Ringtoets.Piping.Primitives\Ringtoets.Piping.Primitives.csproj">
-      <Project>{14c6f716-64e2-4bc4-a1ef-05865fcefa4c}</Project>
-      <Name>Ringtoets.Piping.Primitives</Name>
+    <ProjectReference Include="..\..\..\Piping\test\Ringtoets.Piping.Integration.TestUtils\Ringtoets.Piping.Integration.TestUtils.csproj">
+      <Project>{A4972765-DDBB-4A1E-B17C-7185577E5591}</Project>
+      <Name>Ringtoets.Piping.Integration.TestUtils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Piping\test\Ringtoets.Piping.Integration.TestUtils.Test\Ringtoets.Piping.Integration.TestUtils.Test.csproj">
-      <Project>{070DC87D-520B-4A84-8965-ED5012875FCC}</Project>
-      <Name>Ringtoets.Piping.Integration.TestUtils.Test</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87c2c553-c0bc-40bf-b1ea-b83bff357f27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
@@ -129,10 +125,6 @@
       <Project>{11f1f874-45af-43e4-8ae5-15a5c9593e28}</Project>
       <Name>Ringtoets.Integration.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Ringtoets.Integration.Service\Ringtoets.Integration.Service.csproj">
-      <Project>{28811c4a-6c18-42c1-88b2-a03a3784e2d0}</Project>
-      <Name>Ringtoets.Integration.Service</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.Integration.TestUtils\Ringtoets.Integration.TestUtils.csproj">
       <Project>{174ba68d-6176-4ac5-8dfd-98cdd2c4d971}</Project>
       <Name>Ringtoets.Integration.TestUtils</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs
===================================================================
diff -u -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -34,7 +34,7 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.Integration.Data;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Integration.TestUtils.Test;
+using Ringtoets.Piping.Integration.TestUtils;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Data;
@@ -222,8 +222,8 @@
                 {
                     PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(pipingFailureMechanism);
                     PipingTestDataGeneratorHelper.AssertHasSurfaceLines(pipingFailureMechanism);
-                    PipingTestDataGeneratorHelper.AssertPipingFailureMechanismCalculationConfigurationsWithOutputs(pipingFailureMechanism);
-                    PipingTestDataGeneratorHelper.AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(pipingFailureMechanism);
+                    PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithOutputs(pipingFailureMechanism);
+                    PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(pipingFailureMechanism);
                     containsPipingFailureMechanism = true;
                 }
 
@@ -324,7 +324,7 @@
                 {
                     PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(pipingFailureMechanism);
                     PipingTestDataGeneratorHelper.AssertHasSurfaceLines(pipingFailureMechanism);
-                    PipingTestDataGeneratorHelper.AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(pipingFailureMechanism);
+                    PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(pipingFailureMechanism);
                     containsPipingFailureMechanism = true;
                 }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs
===================================================================
diff -u -r43435200452dd3b310c0c9d044d685209c685eb3 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 43435200452dd3b310c0c9d044d685209c685eb3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -93,7 +93,7 @@
             SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverErosionInwards, hydraulicBoundaryLocation);
             SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverErosionOutwards, hydraulicBoundaryLocation);
             SetFullyConfiguredFailureMechanism(assessmentSection.HeightStructures, hydraulicBoundaryLocation);
-            PipingTestDataGenerator.SetFullyConfiguredFailureMechanism(assessmentSection.PipingFailureMechanism, hydraulicBoundaryLocation);
+            PipingTestDataGenerator.ConfigureFailureMechanismWithAllCalculationConfigurations(assessmentSection.PipingFailureMechanism, hydraulicBoundaryLocation);
             SetFullyConfiguredFailureMechanism(assessmentSection.StabilityPointStructures, hydraulicBoundaryLocation);
             SetFullyConfiguredFailureMechanism(assessmentSection.StabilityStoneCover, hydraulicBoundaryLocation);
             SetFullyConfiguredFailureMechanism(assessmentSection.WaveImpactAsphaltCover, hydraulicBoundaryLocation);
Fisheye: Tag 62365819013badfa7c41bce69ac5f709351ac13f refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs
===================================================================
diff -u -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs	(.../PipingTestDataGeneratorTest.cs)	(revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs	(.../PipingTestDataGeneratorTest.cs)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -20,12 +20,42 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Piping.Data;
 
 namespace Ringtoets.Piping.Integration.TestUtils.Test
 {
     [TestFixture]
     public class PipingTestDataGeneratorTest
     {
+        [Test]
+        public void GetPipingFailureMechanismWithAllCalculationConfigurations_ReturnsFailureMechanismWithAllConfigurations()
+        {
+            // Call
+            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations();
 
+            // Assert
+            PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(failureMechanism);
+            PipingTestDataGeneratorHelper.AssertHasSurfaceLines(failureMechanism);
+            PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithOutputs(failureMechanism);
+            PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(failureMechanism);
+        }
+
+        [Test]
+        public void SetPipingFailureMechanismWithAllCalculationConfigurations_ReturnsFailureMechanismWithAllConfigurations()
+        {
+            // Setup
+            var failureMechanism = new PipingFailureMechanism();
+            var hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
+
+            // Call
+            PipingTestDataGenerator.ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydraulicBoundaryLocation);
+
+            // Assert
+            PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(failureMechanism);
+            PipingTestDataGeneratorHelper.AssertHasSurfaceLines(failureMechanism);
+            PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithOutputs(failureMechanism);
+            PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(failureMechanism);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/Ringtoets.Piping.Integration.TestUtils.Test.csproj
===================================================================
diff -u -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/Ringtoets.Piping.Integration.TestUtils.Test.csproj	(.../Ringtoets.Piping.Integration.TestUtils.Test.csproj)	(revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/Ringtoets.Piping.Integration.TestUtils.Test.csproj	(.../Ringtoets.Piping.Integration.TestUtils.Test.csproj)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -50,7 +50,6 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="PipingTestDataGeneratorHelper.cs" />
     <Compile Include="PipingTestDataGeneratorTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -69,6 +68,10 @@
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
+      <Project>{4843d6e5-066f-4795-94f5-1d53932dd03c}</Project>
+      <Name>Ringtoets.Common.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Piping.Data\Ringtoets.Piping.Data.csproj">
       <Project>{CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB}</Project>
       <Name>Ringtoets.Piping.Data</Name>
@@ -77,10 +80,18 @@
       <Project>{14c6f716-64e2-4bc4-a1ef-05865fcefa4c}</Project>
       <Name>Ringtoets.Piping.Primitives</Name>
     </ProjectReference>
+    <ProjectReference Include="..\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.Integration.TestUtils\Ringtoets.Piping.Integration.TestUtils.csproj">
       <Project>{A4972765-DDBB-4A1E-B17C-7185577E5591}</Project>
       <Name>Ringtoets.Piping.Integration.TestUtils</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>
   </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/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs
===================================================================
diff -u -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -36,13 +36,14 @@
     public static class PipingTestDataGenerator
     {
         /// <summary>
-        /// Gets a fully configured <see cref="PipingFailureMechanism"/>.
+        /// Gets a fully configured <see cref="PipingFailureMechanism"/> with all
+        /// possible parent and nested calculation configurations.
         /// </summary>
-        public static PipingFailureMechanism GetFullyConfiguredPipingFailureMechanism()
+        public static PipingFailureMechanism GetPipingFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new PipingFailureMechanism();
             var hydroLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
-            SetFullyConfiguredFailureMechanism(failureMechanism, hydroLocation);
+            ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydroLocation);
 
             return failureMechanism;
         }
@@ -158,14 +159,14 @@
 
         /// <summary>
         /// Configures a <see cref="PipingFailureMechanism"/> to a fully configured failure
-        /// mechanism.
+        /// mechanism with all possible parent and nested calculation configurations.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to be updated.</param>
         /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location used
         /// by calculations.</param>
         /// <remarks>This method assumes <paramref name="failureMechanism"/> is a newly
         /// created instance.</remarks>
-        public static void SetFullyConfiguredFailureMechanism(PipingFailureMechanism failureMechanism,
+        public static void ConfigureFailureMechanismWithAllCalculationConfigurations(PipingFailureMechanism failureMechanism,
                                                               HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             var surfaceline1 = new RingtoetsPipingSurfaceLine
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGeneratorHelper.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGeneratorHelper.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGeneratorHelper.cs	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -0,0 +1,100 @@
+// Copyright (C) Stichting Deltares 2016. 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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Primitives;
+
+namespace Ringtoets.Piping.Integration.TestUtils
+{
+    /// <summary>
+    /// Class to help asserting the <see cref="PipingTestDataGenerator"/>.
+    /// </summary>
+    public static class PipingTestDataGeneratorHelper
+    {
+        /// <summary>
+        /// Asserts that the <paramref name="failureMechanism"/> contains all possible calculation configurations 
+        /// for the parent and nested calculations with output.
+        /// </summary>
+        /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        public static void AssertHasAllPossibleCalculationConfigurationsWithOutputs(PipingFailureMechanism failureMechanism)
+        {
+            IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
+            AssertPipingCalculationGroupWithOutput(calculationRoot.OfType<PipingCalculation>());
+
+            CalculationGroup nestedCalculations = calculationRoot.OfType<CalculationGroup>().First();
+            AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType<PipingCalculation>());
+        }
+
+        /// <summary>
+        /// Asserts that the <paramref name="failureMechanism"/> contains all possible calculation configurations 
+        /// for the parent and nested calculations without output.
+        /// </summary>
+        /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        public static void AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(PipingFailureMechanism failureMechanism)
+        {
+            IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
+            AssertPipingCalculationGroupWithoutOutput(calculationRoot.OfType<PipingCalculation>());
+
+            CalculationGroup nestedCalculations = calculationRoot.OfType<CalculationGroup>().First();
+            AssertPipingCalculationGroupWithoutOutput(nestedCalculations.Children.OfType<PipingCalculation>());
+        }
+
+        /// <summary>
+        /// Asserts that the <paramref name="failureMechanism"/> contains <see cref="StochasticSoilModel"/>.
+        /// </summary>
+        /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        public static void AssertHasStochasticSoilModels(PipingFailureMechanism failureMechanism)
+        {
+            CollectionAssert.IsNotEmpty(failureMechanism.StochasticSoilModels);
+        }
+
+        /// <summary>
+        /// Asserts sthat the <paramref name="failureMechanism"/> contains <see cref="RingtoetsPipingSurfaceLine"/>.
+        /// </summary>
+        /// <param name="failureMechanism">The failure mechanism to assert.</param>
+        public static void AssertHasSurfaceLines(PipingFailureMechanism failureMechanism)
+        {
+            CollectionAssert.IsNotEmpty(failureMechanism.SurfaceLines);
+        }
+
+        private static void AssertPipingCalculationGroupWithOutput(IEnumerable<PipingCalculation> children)
+        {
+            AssertCalculationConfig(children, true, true);
+        }
+
+        private static void AssertPipingCalculationGroupWithoutOutput(IEnumerable<PipingCalculation> children)
+        {
+            AssertCalculationConfig(children, false, false);
+            AssertCalculationConfig(children, true, false);
+        }
+
+        private static void AssertCalculationConfig(
+            IEnumerable<PipingCalculation> children, bool hasHydraulicBoundaryLocation, bool hasOutput)
+        {
+            Assert.NotNull(children.FirstOrDefault(calc => (calc.InputParameters.HydraulicBoundaryLocation != null) == hasHydraulicBoundaryLocation
+                                                           && calc.HasOutput == hasOutput));
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/Ringtoets.Piping.Integration.TestUtils.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/Ringtoets.Piping.Integration.TestUtils.csproj	(.../Ringtoets.Piping.Integration.TestUtils.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/Ringtoets.Piping.Integration.TestUtils.csproj	(.../Ringtoets.Piping.Integration.TestUtils.csproj)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -39,6 +39,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -47,6 +51,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="PipingTestDataGenerator.cs" />
+    <Compile Include="PipingTestDataGeneratorHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -79,6 +84,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/Piping/test/Ringtoets.Piping.Integration.TestUtils/packages.config
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/packages.config	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/packages.config	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2016. 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.6.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs
===================================================================
diff -u -r1188217e2d4f0c433987018e1cd6eb85af9488c1 -r62365819013badfa7c41bce69ac5f709351ac13f
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 1188217e2d4f0c433987018e1cd6eb85af9488c1)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 62365819013badfa7c41bce69ac5f709351ac13f)
@@ -105,7 +105,7 @@
         public void ClearAllCalculationOutput_WithVariousCalculations_ClearsCalculationsOutputAndReturnsAffectedCalculations()
         {
             // Setup
-            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetFullyConfiguredPipingFailureMechanism();
+            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations();
             ICalculation[] expectedAffectedCalculations = failureMechanism.Calculations
                                                                           .Where(c => c.HasOutput)
                                                                           .ToArray();
@@ -136,7 +136,7 @@
         public void ClearAllCalculationOutputAndHydraulicBoundaryLocations_WithVariousCalculations_ClearsHydraulicBoundaryLocationAndCalculationsAndReturnsAffectedObjects()
         {
             // Setup
-            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetFullyConfiguredPipingFailureMechanism();
+            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations();
             PipingCalculation[] calculations = failureMechanism.Calculations.Cast<PipingCalculation>().ToArray();
             IObservable[] expectedAffectedCalculations = calculations
                 .Where(c => c.HasOutput)
@@ -178,7 +178,7 @@
         public void ClearReferenceLineDependentData_FullyConfiguredFailureMechanism_RemoveReferenceLineDependentDataAndReturnAffectedObjects()
         {
             // Setup
-            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetFullyConfiguredPipingFailureMechanism();
+            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations();
 
             var expectedRemovedObjects = failureMechanism.Sections.OfType<object>()
                                                          .Concat(failureMechanism.SectionResults)
@@ -243,7 +243,7 @@
         public void RemoveSurfaceLine_FullyConfiguredPipingFailureMechanism_RemoveProfileAndClearDependentData()
         {
             // Setup
-            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetFullyConfiguredPipingFailureMechanism();
+            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations();
             RingtoetsPipingSurfaceLine surfaceLine = failureMechanism.SurfaceLines[0];
             PipingCalculation[] calculationsWithSurfaceLine = failureMechanism.Calculations
                                                                               .Cast<PipingCalculation>()
@@ -317,7 +317,7 @@
         public void RemoveStochasticSoilModel_FullyConfiguredPipingFailureMechanism_RemoveProfileAndClearDependentData()
         {
             // Setup
-            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetFullyConfiguredPipingFailureMechanism();
+            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations();
             StochasticSoilModel soilModel = failureMechanism.StochasticSoilModels[1];
             PipingCalculation[] calculationsWithSoilModel = failureMechanism.Calculations
                                                                             .Cast<PipingCalculation>()