diff --git a/EnvelopeGenerator.Tests.Application/Fake.cs b/EnvelopeGenerator.Tests.Application/Fake.cs
index d2237bab..46e8d336 100644
--- a/EnvelopeGenerator.Tests.Application/Fake.cs
+++ b/EnvelopeGenerator.Tests.Application/Fake.cs
@@ -76,11 +76,10 @@ public class Fake
         public async Task AddSampleReceivers()
         {
             var mediator = Mediator;
-            foreach (var email in Provider.Internet.EMailList())
+            foreach (var cmd in Provider.CreateReceiverCommands())
             {
-                var cmd = new CreateReceiverCommand { EmailAddress = email };
                 var (Id, _) = await mediator.Send(cmd);
-                _sampleReceivers.Add((Id, email));
+                _sampleReceivers.Add((Id, cmd.EmailAddress));
             }
         }
         #endregion
@@ -91,8 +90,13 @@ public static class Extensions
 {
     public static Fake.Host ToFake(this IHost host) => new(host);
 
-    public static IEnumerable<string> EMailList(this Internet internet, int minCount = 10, int maxCount = 20)
-        => Enumerable.Range(0, Fake.Provider.Random.Number(minCount, maxCount))
-            .Select(_ => internet.Email())
+    public static CreateReceiverCommand CreateReceiverCommand(this Faker fake) => new()
+    {
+        EmailAddress = fake.Internet.Email(),
+    };
+
+    public static List<CreateReceiverCommand> CreateReceiverCommands(this Faker fake, int minCount = 10, int maxCount = 20)
+        => Enumerable.Range(0, fake.Random.Number(minCount, maxCount))
+            .Select(_ => fake.CreateReceiverCommand())
             .ToList();
 }
\ No newline at end of file