diff --git a/EnvelopeGenerator.Tests.Application/HistoryTests.cs b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
index 3d022b78..b1053dff 100644
--- a/EnvelopeGenerator.Tests.Application/HistoryTests.cs
+++ b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
@@ -2,6 +2,7 @@
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Application.Histories.Queries;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Tests.Application;
 
@@ -24,9 +25,11 @@ public class HistoryTests : TestBase
     public async Task CreateHistory_And_ReadHistory_Should_Work()
     {
         /// Arrange
+        CancellationToken cancel = default;
+
         // Create envelope
-        var createEnvelopeCmd = FakeCreateEnvelopeCommand;
-        var envelope = await Mediator.Send(createEnvelopeCmd).ThrowIfNull(Exceptions.NotFound);
+        var envelope = FakeEnvelope;
+        envelope = await GetRepository<Envelope>().CreateAsync(envelope, cancel);
 
         // Create receiver
         var createReceiverCmd = this.CreateReceiverCommand();
diff --git a/EnvelopeGenerator.Tests.Application/TestBase.cs b/EnvelopeGenerator.Tests.Application/TestBase.cs
index 1a2ace1f..9c0bafde 100644
--- a/EnvelopeGenerator.Tests.Application/TestBase.cs
+++ b/EnvelopeGenerator.Tests.Application/TestBase.cs
@@ -1,4 +1,5 @@
 using Bogus;
+using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.UserManager.Domain.Entities;
 using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Domain.Entities;
@@ -10,13 +11,15 @@ public class TestBase : Faker
 {
     private Fake.Host Host;
 
-    public User User => Host.User;
+    protected User User => Host.User;
 
-    public IMediator Mediator => Host.Mediator;
+    protected IMediator Mediator => Host.Mediator;
 
-    public CreateEnvelopeCommand FakeCreateEnvelopeCommand => this.CreateEnvelopeCommand(Host.User.Id);
+    protected CreateEnvelopeCommand FakeCreateEnvelopeCommand => this.CreateEnvelopeCommand(Host.User.Id);
 
-    public Envelope FakeEnvelope => this.CreateEnvelope(Host.User.Id);
+    protected Envelope FakeEnvelope => this.CreateEnvelope(Host.User.Id);
+
+    protected IRepository<T> GetRepository<T>() where T : class => Host.GetRepository<T>();
 
     [SetUp]
     public virtual async Task Setup()