Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/BackedUpFileWriterTest.cs
===================================================================
diff -u -r26014a51f7e2fd2dff154b0a79c89a1bfb6e0699 -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/BackedUpFileWriterTest.cs	(.../BackedUpFileWriterTest.cs)	(revision 26014a51f7e2fd2dff154b0a79c89a1bfb6e0699)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/BackedUpFileWriterTest.cs	(.../BackedUpFileWriterTest.cs)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -24,6 +24,7 @@
 using System.Security.AccessControl;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Storage.Core.Exceptions;
 
 namespace Ringtoets.Storage.Core.Test
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs
===================================================================
diff -u -r26014a51f7e2fd2dff154b0a79c89a1bfb6e0699 -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 26014a51f7e2fd2dff154b0a79c89a1bfb6e0699)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -30,6 +30,9 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Integration.Data;
+using Ringtoets.Storage.Core.Create;
+using Ringtoets.Storage.Core.DbContext;
+using Ringtoets.Storage.Core.Serializers;
 
 namespace Ringtoets.Storage.Core.Test.Create
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/BackgroundDataCreateExtensionsTest.cs
===================================================================
diff -u -r26014a51f7e2fd2dff154b0a79c89a1bfb6e0699 -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/BackgroundDataCreateExtensionsTest.cs	(.../BackgroundDataCreateExtensionsTest.cs)	(revision 26014a51f7e2fd2dff154b0a79c89a1bfb6e0699)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/BackgroundDataCreateExtensionsTest.cs	(.../BackgroundDataCreateExtensionsTest.cs)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -21,10 +21,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Storage.Core.Create;
+using Ringtoets.Storage.Core.DbContext;
 
 namespace Ringtoets.Storage.Core.Test.Create
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs
===================================================================
diff -u -r26014a51f7e2fd2dff154b0a79c89a1bfb6e0699 -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision 26014a51f7e2fd2dff154b0a79c89a1bfb6e0699)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Calculation;
@@ -32,6 +33,8 @@
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Data;
+using Ringtoets.Storage.Core.Create;
+using Ringtoets.Storage.Core.DbContext;
 
 namespace Ringtoets.Storage.Core.Test.Create
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs
===================================================================
diff -u -r26014a51f7e2fd2dff154b0a79c89a1bfb6e0699 -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs	(.../ClosingStructureCreateExtensionsTest.cs)	(revision 26014a51f7e2fd2dff154b0a79c89a1bfb6e0699)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs	(.../ClosingStructureCreateExtensionsTest.cs)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -25,6 +25,9 @@
 using NUnit.Framework;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Data.TestUtil;
+using Ringtoets.Storage.Core.Create;
+using Ringtoets.Storage.Core.Create.ClosingStructures;
+using Ringtoets.Storage.Core.DbContext;
 
 namespace Ringtoets.Storage.Core.Test.Create.ClosingStructures
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r26014a51f7e2fd2dff154b0a79c89a1bfb6e0699 -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 26014a51f7e2fd2dff154b0a79c89a1bfb6e0699)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -29,6 +29,9 @@
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Storage.Core.Create;
+using Ringtoets.Storage.Core.Create.ClosingStructures;
+using Ringtoets.Storage.Core.DbContext;
 
 namespace Ringtoets.Storage.Core.Test.Create.ClosingStructures
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r26014a51f7e2fd2dff154b0a79c89a1bfb6e0699 -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 26014a51f7e2fd2dff154b0a79c89a1bfb6e0699)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -26,6 +26,9 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Primitives;
+using Ringtoets.Storage.Core.Create;
+using Ringtoets.Storage.Core.Create.ClosingStructures;
+using Ringtoets.Storage.Core.DbContext;
 
 namespace Ringtoets.Storage.Core.Test.Create.ClosingStructures
 {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Ringtoets.Storage.Core.Test.csproj
===================================================================
diff -u -r10ef20dc3d67e47bb4fc8daa74acd823661918fc -r89e98516d0d77726bca56a95d649bb7a3e3333bc
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Ringtoets.Storage.Core.Test.csproj	(.../Ringtoets.Storage.Core.Test.csproj)	(revision 10ef20dc3d67e47bb4fc8daa74acd823661918fc)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Ringtoets.Storage.Core.Test.csproj	(.../Ringtoets.Storage.Core.Test.csproj)	(revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
@@ -410,6 +410,10 @@
       <Project>{03DBE353-99F7-47D6-B826-60D694FFB9AC}</Project>
       <Name>Application.Ringtoets.Storage.TestUtil</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>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">