diff --git a/Directory.Packages.props b/Directory.Packages.props
index e02a53927..a91178548 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -120,8 +120,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Do not update to v8, as it changed license that is mostly unusable for us -->
-    <PackageVersion Include="FluentAssertions" Version="7.2.0" />
+    <PackageVersion Include="AwesomeAssertions" Version="9.6.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
     <PackageVersion Include="xunit.analyzers" Version="1.26.0" />
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests.Integration/OutputCache/RemoteCQRSOutputCachingTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests.Integration/OutputCache/RemoteCQRSOutputCachingTests.cs
index 37375641c..81d92a3a9 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests.Integration/OutputCache/RemoteCQRSOutputCachingTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests.Integration/OutputCache/RemoteCQRSOutputCachingTests.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
@@ -197,7 +197,7 @@ public async Task Age_header_increases_on_subsequent_requests()
         secondHeaders.Should().ContainKey(HeaderNames.Age);
         var ageValue = secondHeaders.GetValues(HeaderNames.Age).FirstOrDefault();
         ageValue.Should().NotBeNull();
-        int.Parse(ageValue!, System.Globalization.CultureInfo.InvariantCulture).Should().BeGreaterOrEqualTo(0);
+        int.Parse(ageValue!, System.Globalization.CultureInfo.InvariantCulture).Should().BeGreaterThanOrEqualTo(0);
     }
 
     [Fact]
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSEndpointsDataSourceTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSEndpointsDataSourceTests.cs
index 17be81e90..e495411c6 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSEndpointsDataSourceTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSEndpointsDataSourceTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Contracts;
 using LeanCode.CQRS.Annotations;
 using LeanCode.CQRS.AspNetCore.Tests.CQRSEndpointsDataSourceTestsContracts;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSObjectsRegistrationSourceTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSObjectsRegistrationSourceTests.cs
index 51ed4d3b3..bc5bbc9f4 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSObjectsRegistrationSourceTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSObjectsRegistrationSourceTests.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Components;
 using LeanCode.Contracts;
 using LeanCode.CQRS.AspNetCore.Registration;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSServicesBuilderTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSServicesBuilderTests.cs
index 6bdf86433..126a9aace 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSServicesBuilderTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/CQRSServicesBuilderTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Components;
 using LeanCode.Contracts;
 using LeanCode.CQRS.AspNetCore.Registration;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallContextTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallContextTests.cs
index b97ae3f02..d33b843cb 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallContextTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallContextTests.cs
@@ -1,5 +1,5 @@
 using System.Security.Claims;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallLifetimeFeatureTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallLifetimeFeatureTests.cs
index c7ebb8426..c80e6291c 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallLifetimeFeatureTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallLifetimeFeatureTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Xunit;
 
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallServiceProvidersFeatureTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallServiceProvidersFeatureTests.cs
index 6e3d10d50..4c2b7a7db 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallServiceProvidersFeatureTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalCallServiceProvidersFeatureTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalHttpRequestTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalHttpRequestTests.cs
index f87f74537..4da3cf006 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalHttpRequestTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/LocalHttpRequestTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Microsoft.AspNetCore.Http;
 using NSubstitute;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullConnectionInfoTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullConnectionInfoTests.cs
index 74f742691..18928e620 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullConnectionInfoTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullConnectionInfoTests.cs
@@ -1,5 +1,5 @@
 using System.Security.Cryptography.X509Certificates;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using NSubstitute;
 using Xunit;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullEndpointFeatureTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullEndpointFeatureTests.cs
index f94e05c1e..10dbc4c45 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullEndpointFeatureTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullEndpointFeatureTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Xunit;
 
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHeaderDictionaryTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHeaderDictionaryTests.cs
index 84673b713..cc5fa045d 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHeaderDictionaryTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHeaderDictionaryTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Microsoft.Extensions.Primitives;
 using Xunit;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHttpResponseTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHttpResponseTests.cs
index 8a97dfa72..df7a75e2a 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHttpResponseTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullHttpResponseTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Microsoft.AspNetCore.Http;
 using NSubstitute;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullRequestCookieCollectionTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullRequestCookieCollectionTests.cs
index 9d14689af..17221c42c 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullRequestCookieCollectionTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullRequestCookieCollectionTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Xunit;
 
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullSessionTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullSessionTests.cs
index e40c15730..8619d9bfa 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullSessionTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullSessionTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Xunit;
 
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullWebSocketManagerTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullWebSocketManagerTests.cs
index d26e8c0d8..7b75eff95 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullWebSocketManagerTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/Context/NullWebSocketManagerTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Local.Context;
 using Xunit;
 
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedExecutorIntegrationTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedExecutorIntegrationTests.cs
index 3c68129b2..cbec74100 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedExecutorIntegrationTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedExecutorIntegrationTests.cs
@@ -1,6 +1,6 @@
 using System.Net.Http.Json;
 using System.Security.Claims;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Components;
 using LeanCode.Contracts;
 using LeanCode.CQRS.AspNetCore.Local;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedLocalExecutorTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedLocalExecutorTests.cs
index dadf85745..28f7e2761 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedLocalExecutorTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewareBasedLocalExecutorTests.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 using System.Security.Claims;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Components;
 using LeanCode.Contracts;
 using LeanCode.CQRS.AspNetCore.Local;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewaresForLocalExecutionTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewaresForLocalExecutionTests.cs
index 431c40fb2..5ef01725c 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewaresForLocalExecutionTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Local/MiddlewaresForLocalExecutionTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Components;
 using LeanCode.Contracts;
 using LeanCode.Contracts.Security;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSExceptionTranslationMiddlewareTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSExceptionTranslationMiddlewareTests.cs
index 6f61622c6..01a005891 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSExceptionTranslationMiddlewareTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSExceptionTranslationMiddlewareTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Contracts;
 using LeanCode.Contracts.Validation;
 using LeanCode.CQRS.AspNetCore.Middleware;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTestBase.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTestBase.cs
index 19a2e89cf..b2a7b6af8 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTestBase.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTestBase.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Metrics;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Serialization;
 using LeanCode.Logging.AspNetCore;
 using LeanCode.OpenTelemetry;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTests.cs
index 54b2adb33..ff1f24e41 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSMiddlewareTests.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Contracts;
 using LeanCode.CQRS.AspNetCore.Middleware;
 using LeanCode.CQRS.Execution;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSOutputCachingObservabilityMiddlewareTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSOutputCachingObservabilityMiddlewareTests.cs
index 14702ce04..3e1e9a750 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSOutputCachingObservabilityMiddlewareTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/CQRSOutputCachingObservabilityMiddlewareTests.cs
@@ -1,5 +1,5 @@
-using FluentAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions;
+using AwesomeAssertions.Execution;
 using LeanCode.Components;
 using LeanCode.Contracts;
 using LeanCode.CQRS.AspNetCore.Middleware;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/SerializerMock.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/SerializerMock.cs
index 1bf235d7c..c54e906b8 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/SerializerMock.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/SerializerMock.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Serialization;
 
 namespace LeanCode.CQRS.AspNetCore.Tests.Middleware;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/TestHelpers.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/TestHelpers.cs
index a20610b2b..3f06eacb3 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/TestHelpers.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Middleware/TestHelpers.cs
@@ -1,5 +1,5 @@
-using FluentAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions;
+using AwesomeAssertions.Execution;
 using LeanCode.Contracts;
 using LeanCode.Contracts.Validation;
 using LeanCode.CQRS.Execution;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ObjectExecutorFactoryTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ObjectExecutorFactoryTests.cs
index 84deeb2e0..66d95c2bc 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ObjectExecutorFactoryTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ObjectExecutorFactoryTests.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Contracts;
 using LeanCode.CQRS.Execution;
 using Microsoft.AspNetCore.Http;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/ApiDescriptionTagsTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/ApiDescriptionTagsTests.cs
index 0ad65f7da..25ec455f4 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/ApiDescriptionTagsTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/ApiDescriptionTagsTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore.Registration;
 using LeanCode.CQRS.Execution;
 using Xunit;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/CQRSApiDescriptionProviderTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/CQRSApiDescriptionProviderTests.cs
index e9492aba3..bf8e4bf63 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/CQRSApiDescriptionProviderTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/Registration/CQRSApiDescriptionProviderTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Components;
 using LeanCode.Contracts;
 using LeanCode.CQRS.AspNetCore.Registration;
diff --git a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ServiceProviderRegistrationExtensionsTests.cs b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ServiceProviderRegistrationExtensionsTests.cs
index 45db57095..af53f2212 100644
--- a/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ServiceProviderRegistrationExtensionsTests.cs
+++ b/test/CQRS/LeanCode.CQRS.AspNetCore.Tests/ServiceProviderRegistrationExtensionsTests.cs
@@ -1,6 +1,6 @@
-using FluentAssertions;
-using FluentAssertions.Execution;
-using FluentAssertions.Primitives;
+using AwesomeAssertions;
+using AwesomeAssertions.Execution;
+using AwesomeAssertions.Primitives;
 using LeanCode.Components;
 using LeanCode.Contracts.Security;
 using LeanCode.CQRS.AspNetCore.Local;
@@ -116,21 +116,21 @@ CancellationToken cancellationToken
 {
     protected override string Identifier => "services";
 
-    public ServiceProviderAssertions(ServiceProvider subject)
-        : base(subject) { }
+    public ServiceProviderAssertions(ServiceProvider subject, AssertionChain assertionChain)
+        : base(subject, assertionChain) { }
 
     public void HaveService<T>(string because = "", params object[] becauseArgs)
     {
-        Execute
-            .Assertion.BecauseOf(because, becauseArgs)
+        CurrentAssertionChain
+            .BecauseOf(because, becauseArgs)
             .ForCondition(Subject.GetRequiredService<IServiceProviderIsService>().IsService(typeof(T)))
             .FailWith("Expected to have {0} registered{reason}", typeof(T));
     }
 
     public void HaveKeyedService<T>(object? serviceKey, string because = "", params object[] becauseArgs)
     {
-        Execute
-            .Assertion.BecauseOf(because, becauseArgs)
+        CurrentAssertionChain
+            .BecauseOf(because, becauseArgs)
             .ForCondition(
                 Subject.GetRequiredService<IServiceProviderIsKeyedService>().IsKeyedService(typeof(T), serviceKey)
             )
@@ -139,8 +139,8 @@ public void HaveKeyedService<T>(object? serviceKey, string because = "", params
 
     public void NotHaveService<T>(string because = "", params object[] becauseArgs)
     {
-        Execute
-            .Assertion.BecauseOf(because, becauseArgs)
+        CurrentAssertionChain
+            .BecauseOf(because, becauseArgs)
             .ForCondition(!Subject.GetRequiredService<IServiceProviderIsService>().IsService(typeof(T)))
             .FailWith("Expected to have {0} registered{reason}", typeof(T));
     }
@@ -148,5 +148,5 @@ public void NotHaveService<T>(string because = "", params object[] becauseArgs)
 
 file static class ServiceProviderExtensions
 {
-    public static ServiceProviderAssertions Should(this ServiceProvider sp) => new(sp);
+    public static ServiceProviderAssertions Should(this ServiceProvider sp) => new(sp, AssertionChain.GetOrCreate());
 }
diff --git a/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheOptionsConfiguratorTests.cs b/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheOptionsConfiguratorTests.cs
index e5451ab21..fc008b29c 100644
--- a/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheOptionsConfiguratorTests.cs
+++ b/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheOptionsConfiguratorTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.OutputCaching.Registration;
 using Microsoft.AspNetCore.OutputCaching;
 using Xunit;
diff --git a/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheRegistryTests.cs b/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheRegistryTests.cs
index c9a53f3f8..dbe3438b8 100644
--- a/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheRegistryTests.cs
+++ b/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/CQRSOutputCacheRegistryTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.Execution;
 using LeanCode.CQRS.OutputCaching.Registration;
 using Microsoft.AspNetCore.OutputCaching;
diff --git a/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/OutputCachingServiceCollectionExtensionsTests.cs b/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/OutputCachingServiceCollectionExtensionsTests.cs
index 689b4d8bb..9116097c0 100644
--- a/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/OutputCachingServiceCollectionExtensionsTests.cs
+++ b/test/CQRS/LeanCode.CQRS.OutputCaching.Tests/OutputCachingServiceCollectionExtensionsTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Components;
 using Microsoft.AspNetCore.OutputCaching;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/test/CQRS/LeanCode.CQRS.Security.Tests/CustomAuthorizerTests.cs b/test/CQRS/LeanCode.CQRS.Security.Tests/CustomAuthorizerTests.cs
index 73ceae834..9cf0492cf 100644
--- a/test/CQRS/LeanCode.CQRS.Security.Tests/CustomAuthorizerTests.cs
+++ b/test/CQRS/LeanCode.CQRS.Security.Tests/CustomAuthorizerTests.cs
@@ -1,5 +1,5 @@
 using System.Security.Claims;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.AspNetCore.Http;
 using NSubstitute;
 using Xunit;
diff --git a/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/AdapterWithAsyncValidatorIntegrationTests.cs b/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/AdapterWithAsyncValidatorIntegrationTests.cs
index ffc607504..74d883676 100644
--- a/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/AdapterWithAsyncValidatorIntegrationTests.cs
+++ b/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/AdapterWithAsyncValidatorIntegrationTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using FluentValidation;
 using LeanCode.Contracts;
 using LeanCode.Contracts.Validation;
diff --git a/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/ModuleTests.cs b/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/ModuleTests.cs
index c40199f99..7aba44883 100644
--- a/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/ModuleTests.cs
+++ b/test/CQRS/LeanCode.CQRS.Validation.Fluent.Tests/ModuleTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using FluentValidation;
 using LeanCode.Components;
 using LeanCode.Contracts;
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index bb254f058..07f23288a 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <PackageReference Include="NSubstitute" />
 
diff --git a/test/Domain/LeanCode.DomainModels.EF.Tests/CollectionExtensionsTests.cs b/test/Domain/LeanCode.DomainModels.EF.Tests/CollectionExtensionsTests.cs
index d8a922af7..a79a3da7b 100644
--- a/test/Domain/LeanCode.DomainModels.EF.Tests/CollectionExtensionsTests.cs
+++ b/test/Domain/LeanCode.DomainModels.EF.Tests/CollectionExtensionsTests.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.QueryableExtensions;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingCompositeTests.cs b/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingCompositeTests.cs
index 971c4b854..f925aa10a 100644
--- a/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingCompositeTests.cs
+++ b/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingCompositeTests.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
diff --git a/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingTests.cs b/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingTests.cs
index 7d11ce880..7d517d175 100644
--- a/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingTests.cs
+++ b/test/Domain/LeanCode.DomainModels.EF.Tests/EFRepositoryTrackingTests.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
diff --git a/test/Domain/LeanCode.DomainModels.EF.Tests/TimestampTzExpressionInterceptorTests.cs b/test/Domain/LeanCode.DomainModels.EF.Tests/TimestampTzExpressionInterceptorTests.cs
index 593a24dd3..a606e2dd1 100644
--- a/test/Domain/LeanCode.DomainModels.EF.Tests/TimestampTzExpressionInterceptorTests.cs
+++ b/test/Domain/LeanCode.DomainModels.EF.Tests/TimestampTzExpressionInterceptorTests.cs
@@ -1,5 +1,5 @@
 using System.Linq.Expressions;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Model;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/GuidTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/GuidTests.cs
index c5c5c5861..1f290de62 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/GuidTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/GuidTests.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/IntTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/IntTests.cs
index ef873d984..f3f7e9ca6 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/IntTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/IntTests.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/LongTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/LongTests.cs
index 43882ccaa..531c8a74a 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/LongTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/LongTests.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedGuidTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedGuidTests.cs
index 7b1421bfb..656e90dc0 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedGuidTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedGuidTests.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringTests.cs
index 762814ba4..d2d135c93 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringTests.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringVariationsTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringVariationsTests.cs
index d67f4432d..c5163e0e0 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringVariationsTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedStringVariationsTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidTests.cs
index 3813716bf..d5aad84fb 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidTests.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Text;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using LeanCode.DomainModels.Ulids;
 using Xunit;
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidVariationsTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidVariationsTests.cs
index 8a3202566..05aac725d 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidVariationsTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/PrefixedUlidVariationsTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ids/RawStringTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ids/RawStringTests.cs
index 5197cd09e..60e5f7908 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ids/RawStringTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ids/RawStringTests.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Model/TimestampTzTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Model/TimestampTzTests.cs
index 4cd1fd0d4..7b06faf9f 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Model/TimestampTzTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Model/TimestampTzTests.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Model;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidJsonConverterTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidJsonConverterTests.cs
index b813f35ef..76e233a3c 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidJsonConverterTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidJsonConverterTests.cs
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ulids;
 using Xunit;
 
diff --git a/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidTests.cs b/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidTests.cs
index 3d9dbb753..8a5ab6f54 100644
--- a/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidTests.cs
+++ b/test/Domain/LeanCode.DomainModels.Tests/Ulids/UlidTests.cs
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
 using System.Globalization;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Ulids;
 using Xunit;
 
diff --git a/test/Infrastructure/LeanCode.AuditLogs.Tests/AuditLogsIntegrationTests.cs b/test/Infrastructure/LeanCode.AuditLogs.Tests/AuditLogsIntegrationTests.cs
index 1159a8c4a..b975fd270 100644
--- a/test/Infrastructure/LeanCode.AuditLogs.Tests/AuditLogsIntegrationTests.cs
+++ b/test/Infrastructure/LeanCode.AuditLogs.Tests/AuditLogsIntegrationTests.cs
@@ -2,7 +2,7 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.MassTransitRelay;
 using LeanCode.Logging;
 using LeanCode.OpenTelemetry;
diff --git a/test/Infrastructure/LeanCode.AuditLogs.Tests/ChangedEntititesExtractorTests.cs b/test/Infrastructure/LeanCode.AuditLogs.Tests/ChangedEntititesExtractorTests.cs
index af88e89e6..aa0191625 100644
--- a/test/Infrastructure/LeanCode.AuditLogs.Tests/ChangedEntititesExtractorTests.cs
+++ b/test/Infrastructure/LeanCode.AuditLogs.Tests/ChangedEntititesExtractorTests.cs
@@ -1,7 +1,7 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using FluentAssertions;
+using AwesomeAssertions;
 using Xunit;
 
 namespace LeanCode.AuditLogs.Tests;
diff --git a/test/Infrastructure/LeanCode.Azure.Tests/AzureStorageAuditLogIntegrationTests.cs b/test/Infrastructure/LeanCode.Azure.Tests/AzureStorageAuditLogIntegrationTests.cs
index 78aaed29e..4a40906d0 100644
--- a/test/Infrastructure/LeanCode.Azure.Tests/AzureStorageAuditLogIntegrationTests.cs
+++ b/test/Infrastructure/LeanCode.Azure.Tests/AzureStorageAuditLogIntegrationTests.cs
@@ -2,10 +2,10 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using AwesomeAssertions;
 using Azure.Data.Tables;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
-using FluentAssertions;
 using LeanCode.AuditLogs;
 using LeanCode.Logging;
 using LeanCode.Test.Helpers;
diff --git a/test/Infrastructure/LeanCode.Azure.Tests/PostgresAD/NpgsqlActiveDirectoryAuthenticationTests.cs b/test/Infrastructure/LeanCode.Azure.Tests/PostgresAD/NpgsqlActiveDirectoryAuthenticationTests.cs
index 86118baa0..c30296972 100644
--- a/test/Infrastructure/LeanCode.Azure.Tests/PostgresAD/NpgsqlActiveDirectoryAuthenticationTests.cs
+++ b/test/Infrastructure/LeanCode.Azure.Tests/PostgresAD/NpgsqlActiveDirectoryAuthenticationTests.cs
@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.Npgsql.ActiveDirectory;
 using LeanCode.Test.Helpers;
 using Npgsql;
diff --git a/test/Infrastructure/LeanCode.Firebase.FCM.Tests/NotificationConversionTests.cs b/test/Infrastructure/LeanCode.Firebase.FCM.Tests/NotificationConversionTests.cs
index 3b53132b6..84a614cbf 100644
--- a/test/Infrastructure/LeanCode.Firebase.FCM.Tests/NotificationConversionTests.cs
+++ b/test/Infrastructure/LeanCode.Firebase.FCM.Tests/NotificationConversionTests.cs
@@ -1,5 +1,5 @@
 using System.Globalization;
-using FluentAssertions;
+using AwesomeAssertions;
 using Xunit;
 
 namespace LeanCode.Firebase.FCM.Tests;
diff --git a/test/Infrastructure/LeanCode.ForceUpdate.Tests/ForceUpdateTests.cs b/test/Infrastructure/LeanCode.ForceUpdate.Tests/ForceUpdateTests.cs
index 4e8889a1f..ace260b30 100644
--- a/test/Infrastructure/LeanCode.ForceUpdate.Tests/ForceUpdateTests.cs
+++ b/test/Infrastructure/LeanCode.ForceUpdate.Tests/ForceUpdateTests.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.AspNetCore;
 using LeanCode.CQRS.Execution;
 using LeanCode.ForceUpdate.Contracts;
diff --git a/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationExtensionsTests.cs b/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationExtensionsTests.cs
index ad2d66556..b10625634 100644
--- a/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationExtensionsTests.cs
+++ b/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationExtensionsTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.ServiceToService.Incoming;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
diff --git a/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationHandlerTests.cs b/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationHandlerTests.cs
index 52d5d593d..5072b92ee 100644
--- a/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationHandlerTests.cs
+++ b/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceAuthenticationHandlerTests.cs
@@ -1,6 +1,6 @@
 using System.Security.Claims;
-using FluentAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions;
+using AwesomeAssertions.Execution;
 using LeanCode.CQRS.Security;
 using LeanCode.ServiceToService.Incoming;
 using Microsoft.AspNetCore.Authentication;
diff --git a/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceCallerRolesValidatorTests.cs b/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceCallerRolesValidatorTests.cs
index 14373e98a..a0f61a287 100644
--- a/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceCallerRolesValidatorTests.cs
+++ b/test/Infrastructure/LeanCode.ServiceToService.Tests/Incoming/ServiceToServiceCallerRolesValidatorTests.cs
@@ -1,5 +1,5 @@
-using FluentAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions;
+using AwesomeAssertions.Execution;
 using LeanCode.CQRS.Security;
 using LeanCode.ServiceToService.Incoming;
 using Xunit;
diff --git a/test/Infrastructure/LeanCode.ServiceToService.Tests/Outgoing/ServiceToServiceHttpClientExtensionsTests.cs b/test/Infrastructure/LeanCode.ServiceToService.Tests/Outgoing/ServiceToServiceHttpClientExtensionsTests.cs
index 217b8ca3b..47d02bd6e 100644
--- a/test/Infrastructure/LeanCode.ServiceToService.Tests/Outgoing/ServiceToServiceHttpClientExtensionsTests.cs
+++ b/test/Infrastructure/LeanCode.ServiceToService.Tests/Outgoing/ServiceToServiceHttpClientExtensionsTests.cs
@@ -1,5 +1,5 @@
-using FluentAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions;
+using AwesomeAssertions.Execution;
 using LeanCode.ServiceToService.Outgoing;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
diff --git a/test/LeanCode.IntegrationTests/CQRSTests.cs b/test/LeanCode.IntegrationTests/CQRSTests.cs
index dd7b09029..3d0c53613 100644
--- a/test/LeanCode.IntegrationTests/CQRSTests.cs
+++ b/test/LeanCode.IntegrationTests/CQRSTests.cs
@@ -1,5 +1,5 @@
-using FluentAssertions;
-using FluentAssertions.Execution;
+using AwesomeAssertions;
+using AwesomeAssertions.Execution;
 using LeanCode.CQRS.RemoteHttp.Client;
 using LeanCode.IntegrationTestHelpers;
 using LeanCode.IntegrationTests.App;
diff --git a/test/LeanCode.IntegrationTests/EFRepositoryTests.cs b/test/LeanCode.IntegrationTests/EFRepositoryTests.cs
index e7ed9f791..b3096b95b 100644
--- a/test/LeanCode.IntegrationTests/EFRepositoryTests.cs
+++ b/test/LeanCode.IntegrationTests/EFRepositoryTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.EF;
 using LeanCode.IntegrationTests.App;
 using LeanCode.Test.Helpers;
diff --git a/test/LeanCode.IntegrationTests/TimestampTzTests.cs b/test/LeanCode.IntegrationTests/TimestampTzTests.cs
index ea95e01ac..b239f79ef 100644
--- a/test/LeanCode.IntegrationTests/TimestampTzTests.cs
+++ b/test/LeanCode.IntegrationTests/TimestampTzTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.DomainModels.Model;
 using LeanCode.IntegrationTests.App;
 using Microsoft.EntityFrameworkCore;
diff --git a/test/Testing/LeanCode.IntegrationTestHelpers.Tests/TestConnectionStringTests.cs b/test/Testing/LeanCode.IntegrationTestHelpers.Tests/TestConnectionStringTests.cs
index 003c82457..79b570dfb 100644
--- a/test/Testing/LeanCode.IntegrationTestHelpers.Tests/TestConnectionStringTests.cs
+++ b/test/Testing/LeanCode.IntegrationTestHelpers.Tests/TestConnectionStringTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.Extensions.Configuration;
 using Xunit;
 
diff --git a/test/Testing/LeanCode.IntegrationTestHelpers.Tests/Tests.cs b/test/Testing/LeanCode.IntegrationTestHelpers.Tests/Tests.cs
index d0f9fa147..817796d27 100644
--- a/test/Testing/LeanCode.IntegrationTestHelpers.Tests/Tests.cs
+++ b/test/Testing/LeanCode.IntegrationTestHelpers.Tests/Tests.cs
@@ -1,5 +1,5 @@
 using System.Security.Claims;
-using FluentAssertions;
+using AwesomeAssertions;
 using LeanCode.CQRS.RemoteHttp.Client;
 using LeanCode.IntegrationTestHelpers.Tests.App;
 using Microsoft.Extensions.DependencyInjection;