Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Riskeer.HydraRing.Calculation.csproj
===================================================================
diff -u -reb8a42007b12ebe0cdfe5d9469d81147c48f1e89 -r1cc69a3199be14c5c6113a301b4ab29d89ab56f1
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Riskeer.HydraRing.Calculation.csproj	(.../Riskeer.HydraRing.Calculation.csproj)	(revision eb8a42007b12ebe0cdfe5d9469d81147c48f1e89)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Riskeer.HydraRing.Calculation.csproj	(.../Riskeer.HydraRing.Calculation.csproj)	(revision 1cc69a3199be14c5c6113a301b4ab29d89ab56f1)
@@ -7,7 +7,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Services/HydraRingInitializationService.cs
===================================================================
diff -u -r0f348e80d99a4140aa25feb9d7b81966188e9d55 -r1cc69a3199be14c5c6113a301b4ab29d89ab56f1
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Services/HydraRingInitializationService.cs	(.../HydraRingInitializationService.cs)	(revision 0f348e80d99a4140aa25feb9d7b81966188e9d55)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Services/HydraRingInitializationService.cs	(.../HydraRingInitializationService.cs)	(revision 1cc69a3199be14c5c6113a301b4ab29d89ab56f1)
@@ -22,7 +22,7 @@
 using System;
 using System.IO;
 using System.Security;
-using Core.Common.TestUtil;
+using Riskeer.Common.Util;
 using Riskeer.HydraRing.Calculation.Data;
 using Riskeer.HydraRing.Calculation.Data.Input;
 using Riskeer.HydraRing.Calculation.Providers;
@@ -84,7 +84,7 @@
             TemporaryWorkingDirectory = temporaryWorkingDirectory;
             hlcdFilePath = settings.HlcdFilePath;
 
-            string applicationFolder = TestHelper.GetApplicationDirectory();
+            string applicationFolder = AssemblyHelper.GetApplicationDirectory();
             hydraRingDirectory = Path.Combine(applicationFolder, "Standalone", "Deltares", $"{hydraRingBinariesSubDirectory}-{HydraRingFileConstants.HydraRingVersionNumber}");
 
             configurationDatabaseFilePath = Path.Combine(hydraRingDirectory, HydraRingFileConstants.ConfigurationDatabaseFileName);