diff --git a/EnvelopeGenerator.Tests.Application/DocSignedNotificationTest.cs b/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
similarity index 81%
rename from EnvelopeGenerator.Tests.Application/DocSignedNotificationTest.cs
rename to EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
index 076c8922..1ac05dd9 100644
--- a/EnvelopeGenerator.Tests.Application/DocSignedNotificationTest.cs
+++ b/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
@@ -1,6 +1,6 @@
 namespace EnvelopeGenerator.Tests.Application;
 
-public class DocSignedNotificationTest
+public class DocSignedNotificationTests
 {
     [SetUp]
     public void Setup()
diff --git a/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj b/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj
index 1bbee7d0..bede092c 100644
--- a/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj
+++ b/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj
@@ -50,4 +50,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="DocSignedNotification\" />
+  </ItemGroup>
+
 </Project>
diff --git a/EnvelopeGenerator.Tests.Application/Fake.cs b/EnvelopeGenerator.Tests.Application/Fake.cs
index 8db07a93..362916c6 100644
--- a/EnvelopeGenerator.Tests.Application/Fake.cs
+++ b/EnvelopeGenerator.Tests.Application/Fake.cs
@@ -7,6 +7,8 @@ using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Application.Users.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
@@ -15,8 +17,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Tests.Application;
 
@@ -139,9 +139,9 @@ public static class Extensions
     }
 
     #region Receiver Command
-    public static CreateReceiverCommand CreateReceiverCommand(this Faker fake) => new()
+    public static CreateReceiverCommand CreateReceiverCommand(this Faker fake, string? emailAddress = null) => new()
     {
-        EmailAddress = fake.Internet.Email(),
+        EmailAddress = emailAddress ?? fake.Internet.Email(),
     };
 
     public static List<CreateReceiverCommand> CreateReceiverCommands(this Faker fake, int minCount = 10, int maxCount = 20)