Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/Assembly/RuntimeProbingPrivatePathGenerator.cs
===================================================================
diff -u -r935883f284f1b8abbc33474f0df21eb3844e6bee -rb2a468f9ee8aae737da8f7f233ad8405dc3bd707
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/Assembly/RuntimeProbingPrivatePathGenerator.cs	(.../RuntimeProbingPrivatePathGenerator.cs)	(revision 935883f284f1b8abbc33474f0df21eb3844e6bee)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/Assembly/RuntimeProbingPrivatePathGenerator.cs	(.../RuntimeProbingPrivatePathGenerator.cs)	(revision b2a468f9ee8aae737da8f7f233ad8405dc3bd707)
@@ -21,8 +21,8 @@
 
 using System;
 using System.IO;
-using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.Common.Util;
 
 namespace Application.Riskeer.Integration.Test.Assembly
 {
@@ -47,7 +47,7 @@
         public void WritePrivatePathStringToConsole()
         {
             var privatePath = string.Empty;
-            string assemblyDirectory = TestHelper.GetApplicationDirectory();
+            string assemblyDirectory = AssemblyHelper.GetApplicationDirectory();
             string rootDirectory = Directory.GetParent(assemblyDirectory).FullName;
 
             AddAssemblyPathsRecursively(assemblyDirectory, ref privatePath);
Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u -r9cf5887aa60bb1af2455e3482948dc803a060b19 -rb2a468f9ee8aae737da8f7f233ad8405dc3bd707
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 9cf5887aa60bb1af2455e3482948dc803a060b19)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision b2a468f9ee8aae737da8f7f233ad8405dc3bd707)
@@ -50,23 +50,6 @@
         public static string SolutionRoot => Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\..\..\"));
 
         /// <summary>
-        /// Returns a full path to the application directory, which contains all assemblies that are required for running
-        /// the application.
-        /// </summary>
-        /// <returns>A full path to the application directory.</returns>
-        public static string GetApplicationDirectory()
-        {
-            DirectoryInfo rootDirectoryInfo = Directory.GetParent(Assembly.GetExecutingAssembly().Location);
-
-            while (rootDirectoryInfo.GetDirectories().All(di => di.Name != "Application"))
-            {
-                rootDirectoryInfo = Directory.GetParent(rootDirectoryInfo.FullName);
-            }
-
-            return Path.Combine(rootDirectoryInfo.FullName, "Application");
-        }
-
-        /// <summary>
         /// Returns the location on disk that can be used safely for writing to disk temporarily.
         /// </summary>
         /// <returns>The folder path.</returns>
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r0f348e80d99a4140aa25feb9d7b81966188e9d55 -rb2a468f9ee8aae737da8f7f233ad8405dc3bd707
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs	(.../HydraRingConfigurationServiceIntegrationTest.cs)	(revision 0f348e80d99a4140aa25feb9d7b81966188e9d55)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs	(.../HydraRingConfigurationServiceIntegrationTest.cs)	(revision b2a468f9ee8aae737da8f7f233ad8405dc3bd707)
@@ -24,6 +24,7 @@
 using System.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.Common.Util;
 using Riskeer.HydraRing.Calculation.Data;
 using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics;
 using Riskeer.HydraRing.Calculation.Data.Input.Overtopping;
@@ -38,7 +39,7 @@
     public class HydraRingConfigurationServiceIntegrationTest
     {
         private static readonly string hydraRingDirectory = Path.Combine(
-            TestHelper.GetApplicationDirectory(), "Standalone",
+            AssemblyHelper.GetApplicationDirectory(), "Standalone",
             "Deltares", $"HydraRing-{HydraRingFileConstants.HydraRingVersionNumber}");
 
         [Test]
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Riskeer.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -rb2a468f9ee8aae737da8f7f233ad8405dc3bd707
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Riskeer.HydraRing.Calculation.Test.csproj	(.../Riskeer.HydraRing.Calculation.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Riskeer.HydraRing.Calculation.Test.csproj	(.../Riskeer.HydraRing.Calculation.Test.csproj)	(revision b2a468f9ee8aae737da8f7f233ad8405dc3bd707)
@@ -13,6 +13,7 @@
   <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" />
     <ProjectReference Include="..\..\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj" />
     <ProjectReference Include="..\Riskeer.HydraRing.Calculation.TestUtil\Riskeer.HydraRing.Calculation.TestUtil.csproj" />
   </ItemGroup>
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs
===================================================================
diff -u -r0f348e80d99a4140aa25feb9d7b81966188e9d55 -rb2a468f9ee8aae737da8f7f233ad8405dc3bd707
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs	(.../HydraRingConfigurationServiceTest.cs)	(revision 0f348e80d99a4140aa25feb9d7b81966188e9d55)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs	(.../HydraRingConfigurationServiceTest.cs)	(revision b2a468f9ee8aae737da8f7f233ad8405dc3bd707)
@@ -24,6 +24,7 @@
 using System.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.Common.Util;
 using Riskeer.HydraRing.Calculation.Data;
 using Riskeer.HydraRing.Calculation.Data.Input;
 using Riskeer.HydraRing.Calculation.Data.Settings;
@@ -37,7 +38,7 @@
     public class HydraRingConfigurationServiceTest
     {
         private static readonly string hydraRingDirectory = Path.Combine(
-            TestHelper.GetApplicationDirectory(), "Standalone",
+            AssemblyHelper.GetApplicationDirectory(), "Standalone",
             "Deltares", $"HydraRing-{HydraRingFileConstants.HydraRingVersionNumber}");
 
         [Test]
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs
===================================================================
diff -u -r0f348e80d99a4140aa25feb9d7b81966188e9d55 -rb2a468f9ee8aae737da8f7f233ad8405dc3bd707
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs	(.../HydraRingInitializationServiceTest.cs)	(revision 0f348e80d99a4140aa25feb9d7b81966188e9d55)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs	(.../HydraRingInitializationServiceTest.cs)	(revision b2a468f9ee8aae737da8f7f233ad8405dc3bd707)
@@ -23,6 +23,7 @@
 using System.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.Common.Util;
 using Riskeer.HydraRing.Calculation.Data;
 using Riskeer.HydraRing.Calculation.Data.Input;
 using Riskeer.HydraRing.Calculation.Services;
@@ -33,7 +34,7 @@
     public class HydraRingInitializationServiceTest
     {
         private static readonly string hydraRingDirectory = Path.Combine(
-            TestHelper.GetApplicationDirectory(), "Standalone",
+            AssemblyHelper.GetApplicationDirectory(), "Standalone",
             "Deltares", $"HydraRing-{HydraRingFileConstants.HydraRingVersionNumber}");
 
         [Test]