Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs
===================================================================
diff -u -r636cd47996c6a6a6c5e62338fdefe180d8a7d600 -ra00bb0bf540641a80d61bcdbb60f085715951e3e
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs	(.../HydraulicLocationEntityTestFactoryTest.cs)	(revision 636cd47996c6a6a6c5e62338fdefe180d8a7d600)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs	(.../HydraulicLocationEntityTestFactoryTest.cs)	(revision a00bb0bf540641a80d61bcdbb60f085715951e3e)
@@ -20,6 +20,8 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.Storage.Core.DbContext;
+using Ringtoets.Storage.Core.TestUtil.Hydraulics;
 
 namespace Ringtoets.Storage.Core.TestUtil.Test.Hydraulics
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/IllustrationPoints/GeneralResultEntityTestHelperTest.cs
===================================================================
diff -u -r636cd47996c6a6a6c5e62338fdefe180d8a7d600 -ra00bb0bf540641a80d61bcdbb60f085715951e3e
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/IllustrationPoints/GeneralResultEntityTestHelperTest.cs	(.../GeneralResultEntityTestHelperTest.cs)	(revision 636cd47996c6a6a6c5e62338fdefe180d8a7d600)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/IllustrationPoints/GeneralResultEntityTestHelperTest.cs	(.../GeneralResultEntityTestHelperTest.cs)	(revision a00bb0bf540641a80d61bcdbb60f085715951e3e)
@@ -25,6 +25,8 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+using Ringtoets.Storage.Core.DbContext;
+using Ringtoets.Storage.Core.TestUtil.IllustrationPoints;
 
 namespace Ringtoets.Storage.Core.TestUtil.Test.IllustrationPoints
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs
===================================================================
diff -u -r636cd47996c6a6a6c5e62338fdefe180d8a7d600 -ra00bb0bf540641a80d61bcdbb60f085715951e3e
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs)	(revision 636cd47996c6a6a6c5e62338fdefe180d8a7d600)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs)	(revision a00bb0bf540641a80d61bcdbb60f085715951e3e)
@@ -21,6 +21,9 @@
 
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
+using Ringtoets.Storage.Core.DbContext;
+using Ringtoets.Storage.Core.Serializers;
+using Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards;
 
 namespace Ringtoets.Storage.Core.TestUtil.Test.MacroStabilityInwards
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityTestFactoryTest.cs
===================================================================
diff -u -r636cd47996c6a6a6c5e62338fdefe180d8a7d600 -ra00bb0bf540641a80d61bcdbb60f085715951e3e
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityTestFactoryTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityTestFactoryTest.cs)	(revision 636cd47996c6a6a6c5e62338fdefe180d8a7d600)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityTestFactoryTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityTestFactoryTest.cs)	(revision a00bb0bf540641a80d61bcdbb60f085715951e3e)
@@ -20,6 +20,8 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.Storage.Core.DbContext;
+using Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards;
 
 namespace Ringtoets.Storage.Core.TestUtil.Test.MacroStabilityInwards
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/PipingStochasticSoilProfileEntityTestFactoryTest.cs
===================================================================
diff -u -r636cd47996c6a6a6c5e62338fdefe180d8a7d600 -ra00bb0bf540641a80d61bcdbb60f085715951e3e
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/PipingStochasticSoilProfileEntityTestFactoryTest.cs	(.../PipingStochasticSoilProfileEntityTestFactoryTest.cs)	(revision 636cd47996c6a6a6c5e62338fdefe180d8a7d600)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/PipingStochasticSoilProfileEntityTestFactoryTest.cs	(.../PipingStochasticSoilProfileEntityTestFactoryTest.cs)	(revision a00bb0bf540641a80d61bcdbb60f085715951e3e)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.Storage.Core.DbContext;
 
 namespace Ringtoets.Storage.Core.TestUtil.Test
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Ringtoets.Storage.Core.TestUtil.Test.csproj
===================================================================
diff -u -r070f3a7908d0aeca1d8bb9157d152f6e77ae2e7f -ra00bb0bf540641a80d61bcdbb60f085715951e3e
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Ringtoets.Storage.Core.TestUtil.Test.csproj	(.../Ringtoets.Storage.Core.TestUtil.Test.csproj)	(revision 070f3a7908d0aeca1d8bb9157d152f6e77ae2e7f)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Ringtoets.Storage.Core.TestUtil.Test.csproj	(.../Ringtoets.Storage.Core.TestUtil.Test.csproj)	(revision a00bb0bf540641a80d61bcdbb60f085715951e3e)
@@ -142,6 +142,14 @@
       <Project>{FAC55B92-E259-43D6-B9A1-5BDA6C834359}</Project>
       <Name>Application.Ringtoets.Migration.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.Storage.Core\Ringtoets.Storage.Core.csproj">
+      <Project>{50963F12-448C-41BA-A62C-CDB0AB8D21E0}</Project>
+      <Name>Ringtoets.Storage.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Storage.Core.TestUtil\Ringtoets.Storage.Core.TestUtil.csproj">
+      <Project>{03DBE353-99F7-47D6-B826-60D694FFB9AC}</Project>
+      <Name>Ringtoets.Storage.Core.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.106.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.106.0\build\net40\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">