diff --git a/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs b/EnvelopeGenerator.Tests/DocSignedNotificationTests.cs
similarity index 97%
rename from EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
rename to EnvelopeGenerator.Tests/DocSignedNotificationTests.cs
index 2f11136e..9ce6dd8a 100644
--- a/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
+++ b/EnvelopeGenerator.Tests/DocSignedNotificationTests.cs
@@ -7,7 +7,7 @@ using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 using EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EnvelopeGenerator.Tests.Application;
+namespace EnvelopeGenerator.Tests;
 
 public class DocSignedNotificationTests : TestBase
 {
diff --git a/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj b/EnvelopeGenerator.Tests/EnvelopeGenerator.Tests.csproj
similarity index 98%
rename from EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj
rename to EnvelopeGenerator.Tests/EnvelopeGenerator.Tests.csproj
index 014d6255..4292c109 100644
--- a/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj
+++ b/EnvelopeGenerator.Tests/EnvelopeGenerator.Tests.csproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.6.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.4.0" />
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
     <PackageReference Include="DigitalData.Core.Abstractions" Version="4.3.0" />
     <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
diff --git a/EnvelopeGenerator.Tests.Application/Fake.cs b/EnvelopeGenerator.Tests/Fake.cs
similarity index 99%
rename from EnvelopeGenerator.Tests.Application/Fake.cs
rename to EnvelopeGenerator.Tests/Fake.cs
index 4d7bf681..3c886904 100644
--- a/EnvelopeGenerator.Tests.Application/Fake.cs
+++ b/EnvelopeGenerator.Tests/Fake.cs
@@ -22,7 +22,7 @@ using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 using EnvelopeGenerator.Application.Common.Extensions;
 
-namespace EnvelopeGenerator.Tests.Application;
+namespace EnvelopeGenerator.Tests;
 
 public class Fake
 {
diff --git a/EnvelopeGenerator.Tests.Application/HistoryTests.cs b/EnvelopeGenerator.Tests/HistoryTests.cs
similarity index 98%
rename from EnvelopeGenerator.Tests.Application/HistoryTests.cs
rename to EnvelopeGenerator.Tests/HistoryTests.cs
index ca40a074..66ca2781 100644
--- a/EnvelopeGenerator.Tests.Application/HistoryTests.cs
+++ b/EnvelopeGenerator.Tests/HistoryTests.cs
@@ -6,7 +6,7 @@ using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EnvelopeGenerator.Tests.Application;
+namespace EnvelopeGenerator.Tests;
 
 [TestFixture]
 public class HistoryTests : TestBase
diff --git a/EnvelopeGenerator.Tests.Application/TestBase.cs b/EnvelopeGenerator.Tests/TestBase.cs
similarity index 99%
rename from EnvelopeGenerator.Tests.Application/TestBase.cs
rename to EnvelopeGenerator.Tests/TestBase.cs
index 0f88a7e0..44cf7f17 100644
--- a/EnvelopeGenerator.Tests.Application/TestBase.cs
+++ b/EnvelopeGenerator.Tests/TestBase.cs
@@ -6,7 +6,7 @@ using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EnvelopeGenerator.Tests.Application;
+namespace EnvelopeGenerator.Tests;
 
 public abstract class TestBase : Faker
 {
diff --git a/EnvelopeGenerator.Tests.Application/appsettings.json b/EnvelopeGenerator.Tests/appsettings.json
similarity index 100%
rename from EnvelopeGenerator.Tests.Application/appsettings.json
rename to EnvelopeGenerator.Tests/appsettings.json