Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs	(.../HydraulicLocationEntityTestFactory.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs	(.../HydraulicLocationEntityTestFactory.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Application.Ringtoets.Storage.DbContext;
-
-namespace Application.Ringtoets.Storage.TestUtil.Hydraulics
+namespace Ringtoets.Storage.Core.TestUtil.Hydraulics
 {
     /// <summary>
     /// Factory for creating <see cref="HydraulicLocationEntity"/>
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs	(.../GeneralResultEntityTestHelper.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs	(.../GeneralResultEntityTestHelper.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -21,12 +21,11 @@
 
 using System;
 using System.Linq;
-using Application.Ringtoets.Storage.DbContext;
 using NUnit.Framework;
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Data.TestUtil;
 
-namespace Application.Ringtoets.Storage.TestUtil.IllustrationPoints
+namespace Ringtoets.Storage.Core.TestUtil.IllustrationPoints
 {
     /// <summary>
     /// Class to assert the properties of general result entities.
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -20,14 +20,13 @@
 // All rights reserved.
 
 using System;
-using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Base.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
-namespace Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards
+namespace Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards
 {
     /// <summary>
     /// Class to assert the properties of macro stability inwards calculation entities.
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationOutputEntityTestHelper.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationOutputEntityTestHelper.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -20,14 +20,12 @@
 // All rights reserved.
 
 using System;
-using Application.Ringtoets.Storage.DbContext;
-using Application.Ringtoets.Storage.Serializers;
 using Core.Common.Base.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
 
-namespace Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards
+namespace Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards
 {
     /// <summary>
     /// Class to assert the properties of macro stability inwards calculation output entities.
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -20,11 +20,9 @@
 // All rights reserved.
 
 using System;
-using Application.Ringtoets.Storage.DbContext;
-using Application.Ringtoets.Storage.Serializers;
 using Core.Common.Base.Geometry;
 
-namespace Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards
+namespace Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards
 {
     /// <summary>
     /// Factory for creating a <see cref="MacroStabilityInwardsSoilLayerTwoDEntity"/> that can 
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityTestFactory.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityTestFactory.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityTestFactory.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityTestFactory.cs	(.../MacroStabilityInwardsStochasticSoilProfileEntityTestFactory.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Application.Ringtoets.Storage.DbContext;
-
-namespace Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards
+namespace Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards
 {
     /// <summary>
     /// Factory for creating a <see cref="MacroStabilityInwardsStochasticSoilProfileEntity"/> that can 
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MigratedDatabaseReader.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MigratedDatabaseReader.cs	(.../MigratedDatabaseReader.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MigratedDatabaseReader.cs	(.../MigratedDatabaseReader.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -25,7 +25,7 @@
 using Core.Common.IO.Readers;
 using NUnit.Framework;
 
-namespace Application.Ringtoets.Storage.TestUtil
+namespace Ringtoets.Storage.Core.TestUtil
 {
     /// <summary>
     /// Database reader for a migrated database.
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MigrationLogTestHelper.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MigrationLogTestHelper.cs	(.../MigrationLogTestHelper.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MigrationLogTestHelper.cs	(.../MigrationLogTestHelper.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -22,7 +22,7 @@
 using Application.Ringtoets.Migration.Core;
 using NUnit.Framework;
 
-namespace Application.Ringtoets.Storage.TestUtil
+namespace Ringtoets.Storage.Core.TestUtil
 {
     /// <summary>
     /// Helper class for asserting content of migration log messages.
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/PipingStochasticSoilProfileEntityTestFactory.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/PipingStochasticSoilProfileEntityTestFactory.cs	(.../PipingStochasticSoilProfileEntityTestFactory.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/PipingStochasticSoilProfileEntityTestFactory.cs	(.../PipingStochasticSoilProfileEntityTestFactory.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Application.Ringtoets.Storage.DbContext;
-
-namespace Application.Ringtoets.Storage.TestUtil
+namespace Ringtoets.Storage.Core.TestUtil
 {
     /// <summary>
     /// Factory for creating a <see cref="PipingStochasticSoilProfileEntity"/> that can 
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs	(.../RingtoetsProjectMigrationTestHelper.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs	(.../RingtoetsProjectMigrationTestHelper.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -23,7 +23,7 @@
 using Core.Common.TestUtil;
 using Ringtoets.Common.Util;
 
-namespace Application.Ringtoets.Storage.TestUtil
+namespace Ringtoets.Storage.Core.TestUtil
 {
     /// <summary>
     /// Class which provides file paths of the Ringtoets project files that can 
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -63,7 +63,7 @@
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 
-namespace Application.Ringtoets.Storage.TestUtil
+namespace Ringtoets.Storage.Core.TestUtil
 {
     /// <summary>
     /// This class can be used to create <see cref="RingtoetsProject"/> instances which have their properties set and can be used in tests.
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs	(.../SqLiteDatabaseHelper.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs	(.../SqLiteDatabaseHelper.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -21,13 +21,12 @@
 
 using System;
 using System.Data.SQLite;
-using Application.Ringtoets.Storage.Properties;
 using Core.Common.IO;
 using NUnit.Framework;
 using Ringtoets.Common.Util;
 using Ringtoets.Integration.Data;
 
-namespace Application.Ringtoets.Storage.TestUtil
+namespace Ringtoets.Storage.Core.TestUtil
 {
     /// <summary>
     /// This class is used to prepare test databases for test.
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/TestFailureMechanismSection.cs
===================================================================
diff -u -rb3ce286cbc2264994426d07eaf15975b01fcf5f7 -r2d41276aeba8f80eb646aee2a6812dddc4110c56
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/TestFailureMechanismSection.cs	(.../TestFailureMechanismSection.cs)	(revision b3ce286cbc2264994426d07eaf15975b01fcf5f7)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/TestFailureMechanismSection.cs	(.../TestFailureMechanismSection.cs)	(revision 2d41276aeba8f80eb646aee2a6812dddc4110c56)
@@ -22,7 +22,7 @@
 using Core.Common.Base.Geometry;
 using Ringtoets.Common.Data.FailureMechanism;
 
-namespace Application.Ringtoets.Storage.TestUtil
+namespace Ringtoets.Storage.Core.TestUtil
 {
     public class TestFailureMechanismSection : FailureMechanismSection
     {