diff --git a/EnvelopeGenerator.Tests/DocSignedNotificationTests.cs b/EnvelopeGenerator.Tests/Application/DocSignedNotificationTests.cs
similarity index 97%
rename from EnvelopeGenerator.Tests/DocSignedNotificationTests.cs
rename to EnvelopeGenerator.Tests/Application/DocSignedNotificationTests.cs
index 0f520606..1f44e1dd 100644
--- a/EnvelopeGenerator.Tests/DocSignedNotificationTests.cs
+++ b/EnvelopeGenerator.Tests/Application/DocSignedNotificationTests.cs
@@ -8,7 +8,7 @@ using EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EnvelopeGenerator.Tests;
+namespace EnvelopeGenerator.Tests.Application;
 
 public class DocSignedNotificationTests : TestBase
 {
diff --git a/EnvelopeGenerator.Tests/Fake.cs b/EnvelopeGenerator.Tests/Application/Fake.cs
similarity index 98%
rename from EnvelopeGenerator.Tests/Fake.cs
rename to EnvelopeGenerator.Tests/Application/Fake.cs
index 75b15e36..1281e7bb 100644
--- a/EnvelopeGenerator.Tests/Fake.cs
+++ b/EnvelopeGenerator.Tests/Application/Fake.cs
@@ -13,6 +13,7 @@ using EnvelopeGenerator.Application.Users.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure;
+using EnvelopeGenerator.Tests.Application;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -23,7 +24,7 @@ using Microsoft.Extensions.Options;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
-namespace EnvelopeGenerator.Tests;
+namespace EnvelopeGenerator.Tests.Application;
 
 public class Fake
 {
@@ -59,7 +60,7 @@ public class Fake
                 {
                     var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
                     options.UseSqlServer(connStr)
-                            .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+                            .LogTo(log => logger.LogInformation("{log}", log), LogLevel.Trace)
                             .EnableSensitiveDataLogging()
                             .EnableDetailedErrors();
                 });
diff --git a/EnvelopeGenerator.Tests/HistoryTests.cs b/EnvelopeGenerator.Tests/Application/HistoryTests.cs
similarity index 98%
rename from EnvelopeGenerator.Tests/HistoryTests.cs
rename to EnvelopeGenerator.Tests/Application/HistoryTests.cs
index 66ca2781..ca40a074 100644
--- a/EnvelopeGenerator.Tests/HistoryTests.cs
+++ b/EnvelopeGenerator.Tests/Application/HistoryTests.cs
@@ -6,7 +6,7 @@ using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EnvelopeGenerator.Tests;
+namespace EnvelopeGenerator.Tests.Application;
 
 [TestFixture]
 public class HistoryTests : TestBase
diff --git a/EnvelopeGenerator.Tests/TestBase.cs b/EnvelopeGenerator.Tests/Application/TestBase.cs
similarity index 99%
rename from EnvelopeGenerator.Tests/TestBase.cs
rename to EnvelopeGenerator.Tests/Application/TestBase.cs
index 391e85f4..f5b362e6 100644
--- a/EnvelopeGenerator.Tests/TestBase.cs
+++ b/EnvelopeGenerator.Tests/Application/TestBase.cs
@@ -6,7 +6,7 @@ using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EnvelopeGenerator.Tests;
+namespace EnvelopeGenerator.Tests.Application;
 
 public abstract class TestBase : Faker
 {