From 32dd852e86ef1f2d73610230cc574ce907e0d08b Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Tue, 26 Sep 2023 02:03:52 +0200
Subject: [PATCH 01/17] Increment version to 5.4.1 (used for pre-release builds
 from ci)

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c2e8807..675fb8b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -49,6 +49,6 @@
     <IsPackable>false</IsPackable>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
-    <JsonApiDotNetCoreMongoDbVersionPrefix>5.4.0</JsonApiDotNetCoreMongoDbVersionPrefix>
+    <JsonApiDotNetCoreMongoDbVersionPrefix>5.4.1</JsonApiDotNetCoreMongoDbVersionPrefix>
   </PropertyGroup>
 </Project>

From 82d39b758e835d0c95495c53c8ac21f5a75510bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 21:37:53 +0000
Subject: [PATCH 02/17] Bump jetbrains.resharper.globaltools from 2023.2.1 to
 2023.2.2 (#26)

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ea2c34b..5d87b8a 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2023.2.1",
+      "version": "2023.2.2",
       "commands": [
         "jb"
       ]

From e928e62ff8164edd76d2cbbca1f56dc78b45f368 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Wed, 27 Sep 2023 03:24:35 +0200
Subject: [PATCH 03/17] Dynamic access of JsonApiOptions properties in tests

---
 ...rAtomicOperationsTestsThatChangeOptions.cs | 75 ++++++-------------
 1 file changed, 24 insertions(+), 51 deletions(-)

diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/BaseForAtomicOperationsTestsThatChangeOptions.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/BaseForAtomicOperationsTestsThatChangeOptions.cs
index 9aa74e8..44397df 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/BaseForAtomicOperationsTestsThatChangeOptions.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/BaseForAtomicOperationsTestsThatChangeOptions.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using JsonApiDotNetCore.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -20,66 +21,38 @@ public void Dispose()
 
     private sealed class JsonApiOptionsScope : IDisposable
     {
+        private static readonly List<PropertyInfo> PropertyCache = typeof(JsonApiOptions).GetProperties().Where(IsAccessibleProperty).ToList();
+
         private readonly JsonApiOptions _options;
         private readonly JsonApiOptions _backupValues;
 
-        public JsonApiOptionsScope(IJsonApiOptions options)
+        public JsonApiOptionsScope(JsonApiOptions options)
         {
-            _options = (JsonApiOptions)options;
+            _options = options;
+            _backupValues = new JsonApiOptions();
 
-            _backupValues = new JsonApiOptions
-            {
-                Namespace = options.Namespace,
-                DefaultAttrCapabilities = options.DefaultAttrCapabilities,
-                DefaultHasOneCapabilities = options.DefaultHasOneCapabilities,
-                DefaultHasManyCapabilities = options.DefaultHasManyCapabilities,
-                IncludeJsonApiVersion = options.IncludeJsonApiVersion,
-                IncludeExceptionStackTraceInErrors = options.IncludeExceptionStackTraceInErrors,
-                IncludeRequestBodyInErrors = options.IncludeRequestBodyInErrors,
-                UseRelativeLinks = options.UseRelativeLinks,
-                TopLevelLinks = options.TopLevelLinks,
-                ResourceLinks = options.ResourceLinks,
-                RelationshipLinks = options.RelationshipLinks,
-                IncludeTotalResourceCount = options.IncludeTotalResourceCount,
-                DefaultPageSize = options.DefaultPageSize,
-                MaximumPageSize = options.MaximumPageSize,
-                MaximumPageNumber = options.MaximumPageNumber,
-                ValidateModelState = options.ValidateModelState,
-                ClientIdGeneration = options.ClientIdGeneration,
-                AllowUnknownQueryStringParameters = options.AllowUnknownQueryStringParameters,
-                AllowUnknownFieldsInRequestBody = options.AllowUnknownFieldsInRequestBody,
-                EnableLegacyFilterNotation = options.EnableLegacyFilterNotation,
-                MaximumIncludeDepth = options.MaximumIncludeDepth,
-                MaximumOperationsPerRequest = options.MaximumOperationsPerRequest,
-                TransactionIsolationLevel = options.TransactionIsolationLevel
-            };
+            CopyPropertyValues(_options, _backupValues);
+        }
+
+        private static bool IsAccessibleProperty(PropertyInfo property)
+        {
+            return property.GetMethod != null && property.SetMethod != null && property.GetCustomAttribute<ObsoleteAttribute>() == null;
         }
 
         public void Dispose()
         {
-            _options.Namespace = _backupValues.Namespace;
-            _options.DefaultAttrCapabilities = _backupValues.DefaultAttrCapabilities;
-            _options.DefaultHasOneCapabilities = _backupValues.DefaultHasOneCapabilities;
-            _options.DefaultHasManyCapabilities = _backupValues.DefaultHasManyCapabilities;
-            _options.IncludeJsonApiVersion = _backupValues.IncludeJsonApiVersion;
-            _options.IncludeExceptionStackTraceInErrors = _backupValues.IncludeExceptionStackTraceInErrors;
-            _options.IncludeRequestBodyInErrors = _backupValues.IncludeRequestBodyInErrors;
-            _options.UseRelativeLinks = _backupValues.UseRelativeLinks;
-            _options.TopLevelLinks = _backupValues.TopLevelLinks;
-            _options.ResourceLinks = _backupValues.ResourceLinks;
-            _options.RelationshipLinks = _backupValues.RelationshipLinks;
-            _options.IncludeTotalResourceCount = _backupValues.IncludeTotalResourceCount;
-            _options.DefaultPageSize = _backupValues.DefaultPageSize;
-            _options.MaximumPageSize = _backupValues.MaximumPageSize;
-            _options.MaximumPageNumber = _backupValues.MaximumPageNumber;
-            _options.ValidateModelState = _backupValues.ValidateModelState;
-            _options.ClientIdGeneration = _backupValues.ClientIdGeneration;
-            _options.AllowUnknownQueryStringParameters = _backupValues.AllowUnknownQueryStringParameters;
-            _options.AllowUnknownFieldsInRequestBody = _backupValues.AllowUnknownFieldsInRequestBody;
-            _options.EnableLegacyFilterNotation = _backupValues.EnableLegacyFilterNotation;
-            _options.MaximumIncludeDepth = _backupValues.MaximumIncludeDepth;
-            _options.MaximumOperationsPerRequest = _backupValues.MaximumOperationsPerRequest;
-            _options.TransactionIsolationLevel = _backupValues.TransactionIsolationLevel;
+            CopyPropertyValues(_backupValues, _options);
+        }
+
+        private static void CopyPropertyValues(JsonApiOptions source, JsonApiOptions destination)
+        {
+            foreach (PropertyInfo property in PropertyCache)
+            {
+                property.SetMethod!.Invoke(destination, new[]
+                {
+                    property.GetMethod!.Invoke(source, null)
+                });
+            }
         }
     }
 }

From e8c9ff67194c2cdef656a1b3dc75f387efdf050b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 7 Oct 2023 08:06:30 +0000
Subject: [PATCH 04/17] Bump dotnet-reportgenerator-globaltool from 5.1.25 to
 5.1.26 (#27)

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 5d87b8a..5468441 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.25",
+      "version": "5.1.26",
       "commands": [
         "reportgenerator"
       ]

From 7a1f84a0bf1e136d0c4dc58db20d1cda4c1f478d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 10:42:42 +0000
Subject: [PATCH 05/17] Bump jetbrains.resharper.globaltools from 2023.2.2 to
 2023.2.3 (#30)

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 5468441..0c4152f 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2023.2.2",
+      "version": "2023.2.3",
       "commands": [
         "jb"
       ]

From 37ffb908204d5ade65770af7f6a38a0d82bea87a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 18:26:00 +0000
Subject: [PATCH 06/17] Update JetBrains.Annotations requirement from 2023.2.*
 to 2023.3.* (#31)

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 675fb8b..48012d3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -30,7 +30,7 @@
     <FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
     <GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
     <InheritDocVersion>1.3.*</InheritDocVersion>
-    <JetBrainsAnnotationsVersion>2023.2.*</JetBrainsAnnotationsVersion>
+    <JetBrainsAnnotationsVersion>2023.3.*</JetBrainsAnnotationsVersion>
     <MongoDBDriverVersion>2.21.*</MongoDBDriverVersion>
     <SourceLinkVersion>1.1.*</SourceLinkVersion>
     <TestSdkVersion>17.7.*</TestSdkVersion>

From 886e8f2b96406b2131b8f1fddca19611fd0b0181 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Nov 2023 17:26:16 +0000
Subject: [PATCH 07/17] Update Microsoft.NET.Test.Sdk requirement from 17.7.*
 to 17.8.* (#32)

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 48012d3..2b53cab 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -33,7 +33,7 @@
     <JetBrainsAnnotationsVersion>2023.3.*</JetBrainsAnnotationsVersion>
     <MongoDBDriverVersion>2.21.*</MongoDBDriverVersion>
     <SourceLinkVersion>1.1.*</SourceLinkVersion>
-    <TestSdkVersion>17.7.*</TestSdkVersion>
+    <TestSdkVersion>17.8.*</TestSdkVersion>
     <XunitVersion>2.5.*</XunitVersion>
   </PropertyGroup>
 

From f5b5d8b183de4d10a882ad062658e51b04b3e2b1 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:07:48 +0100
Subject: [PATCH 08/17] Fix mixed-up IoC container registrations in tests (turn
 off auto-discovery)

---
 .../AtomicOperationsFixture.cs                | 12 ++-
 ...reateResourceWithClientGeneratedIdTests.cs |  2 +-
 ...mplicitlyChangingTextLanguageDefinition.cs | 47 +++++------
 .../Meta/TextLanguageMetaDefinition.cs        |  2 +-
 .../AtomicTransactionConsistencyTests.cs      |  8 +-
 .../Transactions/LyricRepository.cs           | 35 ++++----
 .../Transactions/MusicTrackRepository.cs      | 19 ++---
 .../Transactions/PerformerRepository.cs       | 84 +++++++++----------
 .../Resources/AtomicUpdateResourceTests.cs    |  2 +-
 .../Meta/ResourceMetaTests.cs                 |  4 +
 .../Meta/TopLevelCountTests.cs                |  3 +-
 .../Filtering/FilterDataTypeTests.cs          |  2 +
 .../Filtering/FilterDepthTests.cs             |  2 +
 .../Filtering/FilterOperatorTests.cs          |  2 +
 .../QueryStrings/Filtering/FilterTests.cs     |  2 +
 .../QueryStrings/Includes/IncludeTests.cs     |  2 +
 .../PaginationWithTotalCountTests.cs          |  2 +
 .../Pagination/RangeValidationTests.cs        |  2 +
 .../QueryStrings/Sorting/SortTests.cs         |  2 +
 .../SparseFieldSets/SparseFieldSetTests.cs    |  2 +
 .../ReadWrite/Creating/CreateResourceTests.cs |  2 +
 ...reateResourceWithClientGeneratedIdTests.cs |  8 +-
 ...eateResourceWithToManyRelationshipTests.cs |  2 +
 ...reateResourceWithToOneRelationshipTests.cs |  2 +
 .../ReadWrite/Deleting/DeleteResourceTests.cs |  2 +
 .../Fetching/FetchRelationshipTests.cs        |  2 +
 .../ReadWrite/Fetching/FetchResourceTests.cs  |  2 +
 .../ImplicitlyChangingWorkItemDefinition.cs   | 44 +++++-----
 ...plicitlyChangingWorkItemGroupDefinition.cs | 43 +++++-----
 .../AddToToManyRelationshipTests.cs           |  2 +
 .../RemoveFromToManyRelationshipTests.cs      |  2 +
 .../ReplaceToManyRelationshipTests.cs         |  2 +
 .../UpdateToOneRelationshipTests.cs           |  2 +
 .../ReplaceToManyRelationshipTests.cs         |  2 +
 .../Updating/Resources/UpdateResourceTests.cs | 12 +--
 .../Resources/UpdateToOneRelationshipTests.cs |  2 +
 .../Reading/ResourceDefinitionReadTests.cs    |  6 ++
 .../IntegrationTestContext.cs                 | 21 ++++-
 test/TestBuildingBlocks/ResourceTypeFinder.cs | 31 +++++++
 39 files changed, 260 insertions(+), 165 deletions(-)
 create mode 100644 test/TestBuildingBlocks/ResourceTypeFinder.cs

diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
index e727573..7b0c76b 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
@@ -1,4 +1,6 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Meta;
 using Microsoft.Extensions.DependencyInjection;
 using TestBuildingBlocks;
 using Xunit;
@@ -12,9 +14,17 @@ public sealed class AtomicOperationsFixture : IAsyncLifetime
 
     public AtomicOperationsFixture()
     {
+        TestContext.UseResourceTypesInNamespace(typeof(MusicTrack).Namespace);
+
         TestContext.UseController<OperationsController>();
 
-        TestContext.ConfigureServicesAfterStartup(services => services.AddSingleton<ResourceDefinitionHitCounter>());
+        TestContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+
+            services.AddResourceDefinition<MusicTrackMetaDefinition>();
+            services.AddResourceDefinition<TextLanguageMetaDefinition>();
+        });
     }
 
     public Task InitializeAsync()
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
index bfd4a4e..7fdf996 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
@@ -58,7 +58,7 @@ public async Task Can_create_resource_with_client_generated_string_ID_having_sid
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        string isoCode = $"{newLanguage.IsoCode}{ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingTextLanguageDefinition.Suffix}";
+        string isoCode = $"{newLanguage.IsoCode}{ImplicitlyChangingTextLanguageDefinition.Suffix}";
 
         responseDocument.Results.ShouldHaveCount(1);
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs
index dc5ada1..946bc14 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs
@@ -6,39 +6,34 @@
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations;
 
-[UsedImplicitly]
-public sealed class ContainerTypeToHideFromAutoDiscovery
+/// <summary>
+/// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public abstract class ImplicitlyChangingTextLanguageDefinition : HitCountingResourceDefinition<TextLanguage, string?>
 {
-    /// <summary>
-    /// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
-    /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public abstract class ImplicitlyChangingTextLanguageDefinition : HitCountingResourceDefinition<TextLanguage, string?>
-    {
-        internal const string Suffix = " (changed)";
+    internal const string Suffix = " (changed)";
 
-        private readonly IMongoDataAccess _mongoDataAccess;
+    private readonly IMongoDataAccess _mongoDataAccess;
 
-        protected ImplicitlyChangingTextLanguageDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter,
-            IMongoDataAccess mongoDataAccess)
-            : base(resourceGraph, hitCounter)
-        {
-            _mongoDataAccess = mongoDataAccess;
-        }
+    protected ImplicitlyChangingTextLanguageDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter, IMongoDataAccess mongoDataAccess)
+        : base(resourceGraph, hitCounter)
+    {
+        _mongoDataAccess = mongoDataAccess;
+    }
 
-        public override async Task OnWriteSucceededAsync(TextLanguage resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            await base.OnWriteSucceededAsync(resource, writeOperation, cancellationToken);
+    public override async Task OnWriteSucceededAsync(TextLanguage resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnWriteSucceededAsync(resource, writeOperation, cancellationToken);
 
-            if (writeOperation is not WriteOperationKind.DeleteResource)
-            {
-                resource.IsoCode += Suffix;
+        if (writeOperation is not WriteOperationKind.DeleteResource)
+        {
+            resource.IsoCode += Suffix;
 
-                FilterDefinition<TextLanguage> filter = Builders<TextLanguage>.Filter.Eq(item => item.Id, resource.Id);
+            FilterDefinition<TextLanguage> filter = Builders<TextLanguage>.Filter.Eq(item => item.Id, resource.Id);
 
-                IMongoCollection<TextLanguage> collection = _mongoDataAccess.MongoDatabase.GetCollection<TextLanguage>(nameof(TextLanguage));
-                await collection.ReplaceOneAsync(_mongoDataAccess.ActiveSession, filter, resource, cancellationToken: cancellationToken);
-            }
+            IMongoCollection<TextLanguage> collection = _mongoDataAccess.MongoDatabase.GetCollection<TextLanguage>(nameof(TextLanguage));
+            await collection.ReplaceOneAsync(_mongoDataAccess.ActiveSession, filter, resource, cancellationToken: cancellationToken);
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs
index ef3db2a..bf1bd66 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Meta;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-public sealed class TextLanguageMetaDefinition : ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingTextLanguageDefinition
+public sealed class TextLanguageMetaDefinition : ImplicitlyChangingTextLanguageDefinition
 {
     internal const string NoticeText = "See https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes for ISO 639-1 language codes.";
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
index 4d89d74..a942fae 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
@@ -17,15 +17,17 @@ public AtomicTransactionConsistencyTests(IntegrationTestContext<TestableStartup,
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(MusicTrack).Namespace);
+
         testContext.UseController<OperationsController>();
 
         testContext.ConfigureServicesAfterStartup(services =>
         {
             services.AddSingleton<ResourceDefinitionHitCounter>();
 
-            services.AddResourceRepository<ContainerTypeToHideFromAutoDiscovery.PerformerRepository>();
-            services.AddResourceRepository<ContainerTypeToHideFromAutoDiscovery.MusicTrackRepository>();
-            services.AddResourceRepository<ContainerTypeToHideFromAutoDiscovery.LyricRepository>();
+            services.AddResourceRepository<PerformerRepository>();
+            services.AddResourceRepository<MusicTrackRepository>();
+            services.AddResourceRepository<LyricRepository>();
         });
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
index 93e31b2..cda8d04 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
@@ -9,30 +9,25 @@
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Transactions;
 
-[UsedImplicitly]
-internal sealed partial class ContainerTypeToHideFromAutoDiscovery
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class LyricRepository : MongoRepository<Lyric, string?>, IAsyncDisposable
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class LyricRepository : MongoRepository<Lyric, string?>, IAsyncDisposable
-    {
-        private readonly IOperationsTransaction _transaction;
+    private readonly IOperationsTransaction _transaction;
 
-        public override string TransactionId => _transaction.TransactionId;
+    public override string TransactionId => _transaction.TransactionId;
 
-        public LyricRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph, IResourceFactory resourceFactory,
-            IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
-            IQueryableBuilder queryableBuilder)
-            : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)
-        {
-            IMongoDataAccess otherDataAccess = new MongoDataAccess(mongoDataAccess.MongoDatabase);
+    public LyricRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph, IResourceFactory resourceFactory,
+        IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor, IQueryableBuilder queryableBuilder)
+        : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)
+    {
+        IMongoDataAccess otherDataAccess = new MongoDataAccess(mongoDataAccess.MongoDatabase);
 
-            var factory = new MongoTransactionFactory(otherDataAccess);
-            _transaction = factory.BeginTransactionAsync(CancellationToken.None).Result;
-        }
+        var factory = new MongoTransactionFactory(otherDataAccess);
+        _transaction = factory.BeginTransactionAsync(CancellationToken.None).Result;
+    }
 
-        public async ValueTask DisposeAsync()
-        {
-            await _transaction.DisposeAsync();
-        }
+    public async ValueTask DisposeAsync()
+    {
+        await _transaction.DisposeAsync();
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs
index 5d40f37..9595112 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs
@@ -7,18 +7,15 @@
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Transactions;
 
-internal sealed partial class ContainerTypeToHideFromAutoDiscovery
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class MusicTrackRepository : MongoRepository<MusicTrack, string?>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class MusicTrackRepository : MongoRepository<MusicTrack, string?>
-    {
-        public override string? TransactionId => null;
+    public override string? TransactionId => null;
 
-        public MusicTrackRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
-            IQueryableBuilder queryableBuilder)
-            : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)
-        {
-        }
+    public MusicTrackRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
+        IQueryableBuilder queryableBuilder)
+        : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs
index c4d2e26..2f73d74 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs
@@ -6,60 +6,56 @@
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Transactions;
 
-internal sealed partial class ContainerTypeToHideFromAutoDiscovery
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class PerformerRepository : IResourceRepository<Performer, string?>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PerformerRepository : IResourceRepository<Performer, string?>
+    public Task<IReadOnlyCollection<Performer>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
     {
-        public Task<IReadOnlyCollection<Performer>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+        throw new NotImplementedException();
+    }
 
-        public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task<Performer> GetForCreateAsync(Type resourceClrType, string? id, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task<Performer> GetForCreateAsync(Type resourceClrType, string? id, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task CreateAsync(Performer resourceFromRequest, Performer resourceForDatabase, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task CreateAsync(Performer resourceFromRequest, Performer resourceForDatabase, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task<Performer?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task<Performer?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task UpdateAsync(Performer resourceFromRequest, Performer resourceFromDatabase, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task UpdateAsync(Performer resourceFromRequest, Performer resourceFromDatabase, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task DeleteAsync(Performer? resourceFromDatabase, string? id, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task DeleteAsync(Performer? resourceFromDatabase, string? id, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task SetRelationshipAsync(Performer leftResource, object? rightValue, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task SetRelationshipAsync(Performer leftResource, object? rightValue, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task AddToToManyRelationshipAsync(Performer? leftResource, string? leftId, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task AddToToManyRelationshipAsync(Performer? leftResource, string? leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task RemoveFromToManyRelationshipAsync(Performer leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task RemoveFromToManyRelationshipAsync(Performer leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
index a6cec5b..95a65e9 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
@@ -295,7 +295,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         responseDocument.Results.ShouldHaveCount(1);
 
-        string isoCode = $"{newIsoCode}{ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingTextLanguageDefinition.Suffix}";
+        string isoCode = $"{newIsoCode}{ImplicitlyChangingTextLanguageDefinition.Suffix}";
 
         responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
         {
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs
index 3a3edca..68b8478 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using FluentAssertions;
+using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.DependencyInjection;
 using TestBuildingBlocks;
@@ -16,11 +17,14 @@ public ResourceMetaTests(IntegrationTestContext<TestableStartup, MetaDbContext>
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(SupportTicket).Namespace);
+
         testContext.UseController<SupportTicketsController>();
 
         testContext.ConfigureServicesAfterStartup(services =>
         {
             services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.AddResourceDefinition<SupportTicketDefinition>();
         });
 
         var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
index c486d0d..03406ed 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -18,11 +18,12 @@ public TopLevelCountTests(IntegrationTestContext<TestableStartup, MetaDbContext>
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(SupportTicket).Namespace);
+
         testContext.UseController<SupportTicketsController>();
 
         testContext.ConfigureServicesAfterStartup(services =>
         {
-            services.AddSingleton<ResourceDefinitionHitCounter>();
             services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
         });
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
index 5dc1442..a74e6ee 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
@@ -19,6 +19,8 @@ public FilterDataTypeTests(IntegrationTestContext<TestableStartup, FilterDbConte
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(FilterableResource).Namespace);
+
         testContext.UseController<FilterableResourcesController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs
index 888cd6c..fccf739 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs
@@ -15,6 +15,8 @@ public FilterDepthTests(IntegrationTestContext<TestableStartup, QueryStringDbCon
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Blog).Namespace);
+
         testContext.UseController<BlogsController>();
         testContext.UseController<BlogPostsController>();
     }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs
index 60e10e7..efc7075 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs
@@ -39,6 +39,8 @@ public FilterOperatorTests(IntegrationTestContext<TestableStartup, FilterDbConte
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(FilterableResource).Namespace);
+
         testContext.UseController<FilterableResourcesController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs
index 9be84ed..c432a77 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs
@@ -15,6 +15,8 @@ public FilterTests(IntegrationTestContext<TestableStartup, QueryStringDbContext>
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Blog).Namespace);
+
         testContext.UseController<WebAccountsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs
index 63c5c1f..2fcbfe5 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs
@@ -14,6 +14,8 @@ public IncludeTests(IntegrationTestContext<TestableStartup, QueryStringDbContext
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Blog).Namespace);
+
         testContext.UseController<BlogPostsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs
index d638555..96e031b 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs
@@ -19,6 +19,8 @@ public PaginationWithTotalCountTests(IntegrationTestContext<TestableStartup, Que
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Blog).Namespace);
+
         testContext.UseController<BlogPostsController>();
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs
index 63ec7c6..28a7c06 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs
@@ -15,6 +15,8 @@ public RangeValidationTests(IntegrationTestContext<TestableStartup, QueryStringD
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Blog).Namespace);
+
         testContext.UseController<BlogsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs
index f0846b7..a5269d7 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs
@@ -15,6 +15,8 @@ public SortTests(IntegrationTestContext<TestableStartup, QueryStringDbContext> t
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Blog).Namespace);
+
         testContext.UseController<BlogPostsController>();
         testContext.UseController<BlogsController>();
         testContext.UseController<WebAccountsController>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
index dca4609..d6ee238 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
@@ -17,6 +17,8 @@ public SparseFieldSetTests(IntegrationTestContext<TestableStartup, QueryStringDb
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Blog).Namespace);
+
         testContext.UseController<BlogPostsController>();
         testContext.UseController<WebAccountsController>();
         testContext.UseController<BlogsController>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
index 7797e79..ccc1ec6 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
@@ -15,6 +15,8 @@ public CreateResourceTests(IntegrationTestContext<TestableStartup, ReadWriteDbCo
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
         testContext.UseController<RgbColorsController>();
         testContext.UseController<ModelWithIntIdsController>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
index 9993e03..2fc6b88 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -17,12 +17,14 @@ public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableS
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemGroupsController>();
         testContext.UseController<RgbColorsController>();
 
         testContext.ConfigureServicesAfterStartup(services =>
         {
-            services.AddResourceDefinition<ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemGroupDefinition>();
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
         });
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
@@ -57,7 +59,7 @@ public async Task Can_create_resource_with_client_generated_string_ID_having_sid
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.Created);
 
-        string groupName = $"{newGroup.Name}{ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
+        string groupName = $"{newGroup.Name}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
 
         responseDocument.Data.SingleValue.ShouldNotBeNull();
         responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
@@ -101,7 +103,7 @@ public async Task Can_create_resource_with_client_generated_string_ID_having_sid
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.Created);
 
-        string groupName = $"{newGroup.Name}{ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
+        string groupName = $"{newGroup.Name}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
 
         responseDocument.Data.SingleValue.ShouldNotBeNull();
         responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
index 626547c..e0d92de 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
@@ -15,6 +15,8 @@ public CreateResourceWithToManyRelationshipTests(IntegrationTestContext<Testable
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
index 337d48a..be6732c 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
@@ -15,6 +15,8 @@ public CreateResourceWithToOneRelationshipTests(IntegrationTestContext<TestableS
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemGroupsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
index 99cac72..3e1bb87 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
@@ -15,6 +15,8 @@ public DeleteResourceTests(IntegrationTestContext<TestableStartup, ReadWriteDbCo
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
index 884349d..6a9e32c 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
@@ -15,6 +15,8 @@ public FetchRelationshipTests(IntegrationTestContext<TestableStartup, ReadWriteD
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
         testContext.UseController<UserAccountsController>();
     }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
index e254772..39a52d6 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
@@ -15,6 +15,8 @@ public FetchResourceTests(IntegrationTestContext<TestableStartup, ReadWriteDbCon
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
         testContext.UseController<UserAccountsController>();
     }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
index 4e9f358..4ccfb12 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
@@ -6,37 +6,33 @@
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.ReadWrite;
 
-[UsedImplicitly]
-internal sealed partial class ContainerTypeToHideFromAutoDiscovery
+/// <summary>
+/// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class ImplicitlyChangingWorkItemDefinition : JsonApiResourceDefinition<WorkItem, string?>
 {
-    /// <summary>
-    /// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
-    /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class ImplicitlyChangingWorkItemDefinition : JsonApiResourceDefinition<WorkItem, string?>
-    {
-        internal const string Suffix = " (changed)";
+    internal const string Suffix = " (changed)";
 
-        private readonly ReadWriteDbContext _dbContext;
+    private readonly ReadWriteDbContext _dbContext;
 
-        public ImplicitlyChangingWorkItemDefinition(IResourceGraph resourceGraph, ReadWriteDbContext dbContext)
-            : base(resourceGraph)
-        {
-            _dbContext = dbContext;
-        }
+    public ImplicitlyChangingWorkItemDefinition(IResourceGraph resourceGraph, ReadWriteDbContext dbContext)
+        : base(resourceGraph)
+    {
+        _dbContext = dbContext;
+    }
 
-        public override async Task OnWriteSucceededAsync(WorkItem resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    public override async Task OnWriteSucceededAsync(WorkItem resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation is not WriteOperationKind.DeleteResource)
         {
-            if (writeOperation is not WriteOperationKind.DeleteResource)
+            await _dbContext.WorkItems.ExecuteAsync(async collection =>
             {
-                await _dbContext.WorkItems.ExecuteAsync(async collection =>
-                {
-                    resource.Description += Suffix;
+                resource.Description += Suffix;
 
-                    FilterDefinition<WorkItem> filter = Builders<WorkItem>.Filter.Eq(item => item.Id, resource.Id);
-                    await collection.ReplaceOneAsync(filter, resource, cancellationToken: cancellationToken);
-                });
-            }
+                FilterDefinition<WorkItem> filter = Builders<WorkItem>.Filter.Eq(item => item.Id, resource.Id);
+                await collection.ReplaceOneAsync(filter, resource, cancellationToken: cancellationToken);
+            });
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
index e9abd46..a01c45e 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
@@ -6,36 +6,33 @@
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.ReadWrite;
 
-internal sealed partial class ContainerTypeToHideFromAutoDiscovery
+/// <summary>
+/// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class ImplicitlyChangingWorkItemGroupDefinition : JsonApiResourceDefinition<WorkItemGroup, string?>
 {
-    /// <summary>
-    /// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
-    /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class ImplicitlyChangingWorkItemGroupDefinition : JsonApiResourceDefinition<WorkItemGroup, string?>
-    {
-        internal const string Suffix = " (changed)";
+    internal const string Suffix = " (changed)";
 
-        private readonly ReadWriteDbContext _dbContext;
+    private readonly ReadWriteDbContext _dbContext;
 
-        public ImplicitlyChangingWorkItemGroupDefinition(IResourceGraph resourceGraph, ReadWriteDbContext dbContext)
-            : base(resourceGraph)
-        {
-            _dbContext = dbContext;
-        }
+    public ImplicitlyChangingWorkItemGroupDefinition(IResourceGraph resourceGraph, ReadWriteDbContext dbContext)
+        : base(resourceGraph)
+    {
+        _dbContext = dbContext;
+    }
 
-        public override async Task OnWriteSucceededAsync(WorkItemGroup resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    public override async Task OnWriteSucceededAsync(WorkItemGroup resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation is not WriteOperationKind.DeleteResource)
         {
-            if (writeOperation is not WriteOperationKind.DeleteResource)
+            await _dbContext.Groups.ExecuteAsync(async collection =>
             {
-                await _dbContext.Groups.ExecuteAsync(async collection =>
-                {
-                    resource.Name += Suffix;
+                resource.Name += Suffix;
 
-                    FilterDefinition<WorkItemGroup> filter = Builders<WorkItemGroup>.Filter.Eq(group => group.Id, resource.Id);
-                    await collection.ReplaceOneAsync(filter, resource, cancellationToken: cancellationToken);
-                });
-            }
+                FilterDefinition<WorkItemGroup> filter = Builders<WorkItemGroup>.Filter.Eq(group => group.Id, resource.Id);
+                await collection.ReplaceOneAsync(filter, resource, cancellationToken: cancellationToken);
+            });
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
index 7487ca4..c2fd820 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
@@ -15,6 +15,8 @@ public AddToToManyRelationshipTests(IntegrationTestContext<TestableStartup, Read
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
index 0de1b7b..eab8111 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
@@ -15,6 +15,8 @@ public RemoveFromToManyRelationshipTests(IntegrationTestContext<TestableStartup,
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
index 2c78ccd..9df3deb 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
@@ -15,6 +15,8 @@ public ReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup, Re
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
index 0e76c43..ddd0f1d 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
@@ -15,6 +15,8 @@ public UpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup, Read
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemGroupsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
index ed39b18..f7fa710 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
@@ -15,6 +15,8 @@ public ReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup, Re
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
index 4faf659..555e59e 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
@@ -16,6 +16,8 @@ public UpdateResourceTests(IntegrationTestContext<TestableStartup, ReadWriteDbCo
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemsController>();
         testContext.UseController<WorkItemGroupsController>();
         testContext.UseController<UserAccountsController>();
@@ -23,8 +25,8 @@ public UpdateResourceTests(IntegrationTestContext<TestableStartup, ReadWriteDbCo
 
         testContext.ConfigureServicesAfterStartup(services =>
         {
-            services.AddResourceDefinition<ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemDefinition>();
-            services.AddResourceDefinition<ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemGroupDefinition>();
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
         });
     }
 
@@ -108,7 +110,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        string groupName = $"{newName}{ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
+        string groupName = $"{newName}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
 
         responseDocument.Data.SingleValue.ShouldNotBeNull();
         responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
@@ -251,7 +253,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        string itemDescription = $"{newDescription}{ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
         responseDocument.Data.SingleValue.ShouldNotBeNull();
         responseDocument.Data.SingleValue.Type.Should().Be("workItems");
@@ -307,7 +309,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        string itemDescription = $"{newDescription}{ContainerTypeToHideFromAutoDiscovery.ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
         responseDocument.Data.SingleValue.ShouldNotBeNull();
         responseDocument.Data.SingleValue.Type.Should().Be("workItems");
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
index 2a0faf2..c1e99fc 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
@@ -15,6 +15,8 @@ public UpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup, Read
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(WorkItem).Namespace);
+
         testContext.UseController<WorkItemGroupsController>();
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
index d9b54c4..6392c4b 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
@@ -17,6 +17,8 @@ public ResourceDefinitionReadTests(IntegrationTestContext<TestableStartup, Unive
     {
         _testContext = testContext;
 
+        testContext.UseResourceTypesInNamespace(typeof(Star).Namespace);
+
         testContext.UseController<StarsController>();
         testContext.UseController<PlanetsController>();
         testContext.UseController<MoonsController>();
@@ -25,6 +27,10 @@ public ResourceDefinitionReadTests(IntegrationTestContext<TestableStartup, Unive
         {
             services.AddSingleton<IClientSettingsProvider, TestClientSettingsProvider>();
             services.AddSingleton<ResourceDefinitionHitCounter>();
+
+            services.AddResourceDefinition<MoonDefinition>();
+            services.AddResourceDefinition<PlanetDefinition>();
+            services.AddResourceDefinition<StarDefinition>();
         });
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
diff --git a/test/TestBuildingBlocks/IntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs
index f97fd98..fd69d9d 100644
--- a/test/TestBuildingBlocks/IntegrationTestContext.cs
+++ b/test/TestBuildingBlocks/IntegrationTestContext.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Text.Json;
 using EphemeralMongo;
 using JetBrains.Annotations;
@@ -33,6 +34,7 @@ public class IntegrationTestContext<TStartup, TMongoDbContextShim> : Integration
 {
     private readonly Lazy<IMongoRunner> _runner;
     private readonly Lazy<WebApplicationFactory<TStartup>> _lazyFactory;
+    private readonly HashSet<Type> _resourceClrTypes = new();
     private readonly TestControllerProvider _testControllerProvider = new();
 
     private Action<IServiceCollection>? _afterServicesConfiguration;
@@ -59,6 +61,16 @@ private IMongoRunner StartMongoDb()
         return MongoRunnerProvider.Instance.Get();
     }
 
+    public void UseResourceTypesInNamespace(string? codeNamespace)
+    {
+        Assembly assembly = typeof(TStartup).Assembly;
+
+        foreach (Type resourceClrType in ResourceTypeFinder.GetResourceClrTypesInNamespace(assembly, codeNamespace))
+        {
+            _resourceClrTypes.Add(resourceClrType);
+        }
+    }
+
     public void UseController<TController>()
         where TController : ControllerBase
     {
@@ -84,7 +96,14 @@ private WebApplicationFactory<TStartup> CreateFactory()
                 return client.GetDatabase($"JsonApiDotNetCore_MongoDb_{new Random().Next()}_Test");
             });
 
-            services.AddJsonApi(ConfigureJsonApiOptions, facade => facade.AddAssembly(typeof(TStartup).Assembly));
+            services.AddJsonApi(ConfigureJsonApiOptions, resources: builder =>
+            {
+                foreach (Type resourceClrType in _resourceClrTypes)
+                {
+                    builder.Add(resourceClrType);
+                }
+            });
+
             services.AddJsonApiMongoDb();
 
             services.AddScoped(typeof(IResourceReadRepository<,>), typeof(MongoRepository<,>));
diff --git a/test/TestBuildingBlocks/ResourceTypeFinder.cs b/test/TestBuildingBlocks/ResourceTypeFinder.cs
new file mode 100644
index 0000000..c4d6ecf
--- /dev/null
+++ b/test/TestBuildingBlocks/ResourceTypeFinder.cs
@@ -0,0 +1,31 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using JsonApiDotNetCore.Resources;
+
+#pragma warning disable AV1008 // Class should not be static
+
+namespace TestBuildingBlocks;
+
+internal static class ResourceTypeFinder
+{
+    private static readonly ConcurrentDictionary<Assembly, IReadOnlySet<Type>> ResourceTypesPerAssembly = new();
+    private static readonly ConcurrentDictionary<string, IReadOnlySet<Type>> ResourceTypesPerNamespace = new();
+
+    public static IReadOnlySet<Type> GetResourceClrTypesInNamespace(Assembly assembly, string? codeNamespace)
+    {
+        IReadOnlySet<Type> resourceClrTypesInAssembly = ResourceTypesPerAssembly.GetOrAdd(assembly, GetResourceClrTypesInAssembly);
+
+        string namespaceKey = codeNamespace ?? string.Empty;
+        return ResourceTypesPerNamespace.GetOrAdd(namespaceKey, _ => FilterTypesInNamespace(resourceClrTypesInAssembly, codeNamespace).ToHashSet());
+    }
+
+    private static IReadOnlySet<Type> GetResourceClrTypesInAssembly(Assembly assembly)
+    {
+        return assembly.GetTypes().Where(type => type.IsAssignableTo(typeof(IIdentifiable))).ToHashSet();
+    }
+
+    private static IEnumerable<Type> FilterTypesInNamespace(IEnumerable<Type> resourceClrTypesInAssembly, string? codeNamespace)
+    {
+        return resourceClrTypesInAssembly.Where(resourceClrType => resourceClrType.Namespace == codeNamespace);
+    }
+}

From 27249fb68bbc6a5d121e658e483d276e2a64b5fa Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 02:32:11 +0100
Subject: [PATCH 09/17] Update to JADNC v5.5.0

---
 .config/dotnet-tools.json                     |  4 +-
 .github/ISSUE_TEMPLATE/bug_report.md          |  2 +-
 .github/ISSUE_TEMPLATE/config.yml             | 14 ++++++
 .github/ISSUE_TEMPLATE/feature_request.md     |  2 +-
 .github/ISSUE_TEMPLATE/question.md            |  2 +-
 .github/workflows/build.yml                   | 23 +++++++---
 .github/workflows/codeql.yml                  | 43 +++++++++++++++++++
 .github/workflows/deps-review.yml             | 14 ++++++
 Build.ps1                                     |  5 ++-
 Directory.Build.props                         | 36 +++-------------
 JsonApiDotNetCore.MongoDb.sln                 |  2 +
 JsonApiDotNetCore.MongoDb.sln.DotSettings     |  6 +++
 WarningSeverities.DotSettings                 |  5 +++
 cleanupcode.ps1                               |  6 +--
 inspectcode.ps1                               |  2 +-
 package-versions.props                        | 29 +++++++++++++
 run-docker-mongodb.ps1                        |  9 ++--
 .../GettingStarted/GettingStarted.csproj      |  4 +-
 .../Definitions/TodoItemDefinition.cs         | 23 +++++++---
 .../JsonApiDotNetCoreMongoDbExample.csproj    |  4 +-
 .../Program.cs                                | 15 +++++--
 .../JsonApiDotNetCore.MongoDb.csproj          |  4 +-
 .../JsonApiDotNetCoreMongoDbTests.csproj      |  4 +-
 .../TestBuildingBlocks.csproj                 |  4 +-
 tests.runsettings                             | 16 +++++++
 25 files changed, 210 insertions(+), 68 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/workflows/codeql.yml
 create mode 100644 .github/workflows/deps-review.yml
 create mode 100644 package-versions.props
 create mode 100644 tests.runsettings

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 0c4152f..ad52741 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2023.2.3",
+      "version": "2023.3.0-eap08",
       "commands": [
         "jb"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.26",
+      "version": "5.2.0",
       "commands": [
         "reportgenerator"
       ]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a45d71e..d204896 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve.
 title: ''
 labels: 'bug'
 assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..8bf0a91
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: true
+contact_links:
+- name: Documentation
+  url: https://www.jsonapi.net/usage/resources/index.html
+  about: Read our comprehensive documentation.
+- name: Sponsor JsonApiDotNetCore
+  url: https://github.com/sponsors/json-api-dotnet
+  about: Help the continued development.
+- name: Ask on Gitter
+  url: https://gitter.im/json-api-dotnet-core/Lobby
+  about: Get in touch with the whole community.
+- name: Ask on Stack Overflow
+  url: https://stackoverflow.com/questions/tagged/json-api
+  about: The best place for asking general-purpose questions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index f629ca4..019f7a9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea for this project.
 title: ''
 labels: 'enhancement'
 assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 76b3998..2520ad8 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,6 +1,6 @@
 ---
 name: Question
-about: Ask a question
+about: Ask a question.
 title: ''
 labels: 'question'
 assignees: ''
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc41703..881e2ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,9 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          8.0.x
     - name: Setup PowerShell (Ubuntu)
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -118,10 +120,13 @@ jobs:
         dotnet build --no-restore --configuration Release /p:VersionSuffix=$env:PACKAGE_VERSION_SUFFIX
     - name: Test
       run: |
-        dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;summary.includeSkippedTests=true" -- RunConfiguration.CollectSourceInformation=true DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.DeterministicReport=true
+        dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;summary.includeSkippedTests=true"
     - name: Upload coverage to codecov.io
       if: matrix.os == 'ubuntu-latest'
       uses: codecov/codecov-action@v3
+      with:
+        fail_ci_if_error: true
+        verbose: true
     - name: Generate packages
       shell: pwsh
       run: |
@@ -146,7 +151,9 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          8.0.x
     - name: Git checkout
       uses: actions/checkout@v4
     - name: Restore tools
@@ -157,7 +164,7 @@ jobs:
       run: |
         $inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
         Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        dotnet jb inspectcode JsonApiDotNetCore.MongoDb.sln --build --output="$inspectCodeOutputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
+        dotnet jb inspectcode JsonApiDotNetCore.MongoDb.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
     - name: Verify outcome
       shell: pwsh
       run: |
@@ -197,7 +204,9 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          8.0.x
     - name: Git checkout
       uses: actions/checkout@v4
       with:
@@ -218,13 +227,13 @@ jobs:
         $baseCommitHash = git rev-parse HEAD~1
 
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
-        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
+        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
     - name: CleanupCode (on branch)
       if: github.event_name == 'push' || github.event_name == 'release'
       shell: pwsh
       run: |
         Write-Output "Running code cleanup on all files."
-        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff
+        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff
 
   publish:
     timeout-minutes: 60
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 0000000..5b1868e
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,43 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ 'master', 'release/**' ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ 'master', 'release/**' ]
+  schedule:
+    - cron: '0 0 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: 'ubuntu-latest'
+    timeout-minutes: 60
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+    steps:
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+          6.0.x
+          8.0.x
+    - name: Git checkout
+      uses: actions/checkout@v4
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/deps-review.yml b/.github/workflows/deps-review.yml
new file mode 100644
index 0000000..b994508
--- /dev/null
+++ b/.github/workflows/deps-review.yml
@@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v4
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v3
diff --git a/Build.ps1 b/Build.ps1
index 4854651..3abc926 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -10,13 +10,16 @@ Write-Host "$(pwsh --version)"
 Write-Host "Active .NET SDK: $(dotnet --version)"
 Write-Host "Using version suffix: $versionSuffix"
 
+Remove-Item -Recurse -Force artifacts -ErrorAction SilentlyContinue
+Remove-Item -Recurse -Force * -Include coverage.cobertura.xml
+
 dotnet tool restore
 VerifySuccessExitCode
 
 dotnet build --configuration Release /p:VersionSuffix=$versionSuffix
 VerifySuccessExitCode
 
-dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.DeterministicReport=true
+dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage"
 VerifySuccessExitCode
 
 dotnet reportgenerator -reports:**\coverage.cobertura.xml -targetdir:artifacts\coverage -filefilters:-*.g.cs
diff --git a/Directory.Build.props b/Directory.Build.props
index 2b53cab..dbaf920 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <NoWarn>$(NoWarn);AV2210</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <NoWarn>$(NoWarn);1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -13,42 +13,20 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Published dependencies (only update on major version change) -->
-    <TargetFrameworkName>net6.0</TargetFrameworkName>
-    <JsonApiDotNetCoreFrozenVersion>5.4.0</JsonApiDotNetCoreFrozenVersion>
-    <MongoDBDriverFrozenVersion>2.20.0</MongoDBDriverFrozenVersion>
-
-    <CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
-
-    <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
-    <AspNetCoreVersion>6.0.*</AspNetCoreVersion>
-    <BogusVersion>34.0.*</BogusVersion>
-    <CSharpGuidelinesAnalyzerVersion>3.8.*</CSharpGuidelinesAnalyzerVersion>
-    <CoverletVersion>6.0.*</CoverletVersion>
-    <EphemeralMongoVersion>1.1.*</EphemeralMongoVersion>
-    <FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
-    <GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
-    <InheritDocVersion>1.3.*</InheritDocVersion>
-    <JetBrainsAnnotationsVersion>2023.3.*</JetBrainsAnnotationsVersion>
-    <MongoDBDriverVersion>2.21.*</MongoDBDriverVersion>
-    <SourceLinkVersion>1.1.*</SourceLinkVersion>
-    <TestSdkVersion>17.8.*</TestSdkVersion>
-    <XunitVersion>2.5.*</XunitVersion>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsAnnotationsVersion)" PrivateAssets="All" />
-    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="$(CSharpGuidelinesAnalyzerVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.*" PrivateAssets="All" />
+    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
-    <JsonApiDotNetCoreMongoDbVersionPrefix>5.4.1</JsonApiDotNetCoreMongoDbVersionPrefix>
+    <RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
+    <JsonApiDotNetCoreMongoDbVersionPrefix>5.5.0</JsonApiDotNetCoreMongoDbVersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/JsonApiDotNetCore.MongoDb.sln b/JsonApiDotNetCore.MongoDb.sln
index 0f6c7b7..81b5b78 100644
--- a/JsonApiDotNetCore.MongoDb.sln
+++ b/JsonApiDotNetCore.MongoDb.sln
@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CodingGuidelines.ruleset = CodingGuidelines.ruleset
 		CSharpGuidelinesAnalyzer.config = CSharpGuidelinesAnalyzer.config
 		Directory.Build.props = Directory.Build.props
+		tests.runsettings = tests.runsettings
+		package-versions.props = package-versions.props
 	EndProjectSection
 EndProject
 Global
diff --git a/JsonApiDotNetCore.MongoDb.sln.DotSettings b/JsonApiDotNetCore.MongoDb.sln.DotSettings
index 8e89021..d7699ea 100644
--- a/JsonApiDotNetCore.MongoDb.sln.DotSettings
+++ b/JsonApiDotNetCore.MongoDb.sln.DotSettings
@@ -66,6 +66,7 @@ JsonApiDotNetCore.MongoDb.ArgumentGuard.NotNull($EXPR$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RawStringCanBeSimplified/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCollectionInitializerElementBraces/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -92,7 +93,9 @@ JsonApiDotNetCore.MongoDb.ArgumentGuard.NotNull($EXPR$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseEventArgsEmptyField/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternInIsExpression/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseRawString/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertEmptyCollection/@EntryValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=JADNC_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="JADNC Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSReformatInactiveBranches&gt;True&lt;/CSReformatInactiveBranches&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">JADNC Full Cleanup</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
@@ -113,6 +116,7 @@ JsonApiDotNetCore.MongoDb.ArgumentGuard.NotNull($EXPR$);</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_USINGS_STMT/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_RAW_LITERAL_STRING/@EntryValue">INDENT</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_DECLARATION_PARENS_ARRANGEMENT/@EntryValue">False</s:Boolean>
@@ -125,6 +129,7 @@ JsonApiDotNetCore.MongoDb.ArgumentGuard.NotNull($EXPR$);</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_SWITCH_EXPRESSION_ARRANGEMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_ARRAY_INITIALIZER_ELEMENTS_ON_LINE/@EntryValue">1</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
@@ -145,6 +150,7 @@ JsonApiDotNetCore.MongoDb.ArgumentGuard.NotNull($EXPR$);</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_LINQ_EXPRESSION/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_FOR_STMT_HEADER_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">160</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIST_PATTERN/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
diff --git a/WarningSeverities.DotSettings b/WarningSeverities.DotSettings
index 96f358d..5c641e6 100644
--- a/WarningSeverities.DotSettings
+++ b/WarningSeverities.DotSettings
@@ -124,6 +124,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PropertyCanBeMadeInitOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RawStringCanBeSimplified/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAlwaysMatchSubpattern/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
@@ -163,6 +164,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceAsyncWithTaskReturn/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceObjectPatternWithVarPattern/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSequenceEqualWithConstantPattern/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
@@ -240,6 +242,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCancellationTokenForIAsyncEnumerable/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
@@ -258,10 +261,12 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseRawString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseSwitchCasePatternVariable/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WithExpressionInsteadOfInitializer/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertEmptyCollection/@EntryValue">WARNING</s:String>
 </wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/cleanupcode.ps1 b/cleanupcode.ps1
index 23f2a36..a593bd9 100644
--- a/cleanupcode.ps1
+++ b/cleanupcode.ps1
@@ -28,17 +28,17 @@ if ($revision) {
 
     if ($baseCommitHash -eq $headCommitHash) {
         Write-Output "Running code cleanup on staged/unstaged files."
-        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified
+        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified
         VerifySuccessExitCode
     }
     else {
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files."
-        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
+        dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
         VerifySuccessExitCode
     }
 }
 else {
     Write-Output "Running code cleanup on all files."
-    dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN
+    dotnet regitlint -s JsonApiDotNetCore.MongoDb.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN
     VerifySuccessExitCode
 }
diff --git a/inspectcode.ps1 b/inspectcode.ps1
index dc81b09..13f0abb 100644
--- a/inspectcode.ps1
+++ b/inspectcode.ps1
@@ -10,7 +10,7 @@ if ($LastExitCode -ne 0) {
 
 $outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
 $resultPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.html')
-dotnet jb inspectcode JsonApiDotNetCore.MongoDb.sln --build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
+dotnet jb inspectcode JsonApiDotNetCore.MongoDb.sln --dotnetcoresdk=$(dotnet --version) --build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
 
 if ($LastExitCode -ne 0) {
     throw "Code inspection failed with exit code $LastExitCode"
diff --git a/package-versions.props b/package-versions.props
new file mode 100644
index 0000000..6d226f5
--- /dev/null
+++ b/package-versions.props
@@ -0,0 +1,29 @@
+<Project>
+  <PropertyGroup>
+    <!-- Published dependencies (only update on major version change) -->
+    <JsonApiDotNetCoreFrozenVersion>5.5.0</JsonApiDotNetCoreFrozenVersion>
+    <MongoDBDriverFrozenVersion>2.20.0</MongoDBDriverFrozenVersion>
+
+    <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
+    <BogusVersion>34.0.*</BogusVersion>
+    <CoverletVersion>6.0.*</CoverletVersion>
+    <EphemeralMongoVersion>1.1.*</EphemeralMongoVersion>
+    <FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
+    <GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
+    <InheritDocVersion>1.3.*</InheritDocVersion>
+    <MongoDBDriverVersion>2.22.*</MongoDBDriverVersion>
+    <SourceLinkVersion>8.0.*</SourceLinkVersion>
+    <TestSdkVersion>17.8.*</TestSdkVersion>
+    <XunitVersion>2.5.*</XunitVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
+    <AspNetCoreVersion>8.0.*</AspNetCoreVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
+    <AspNetCoreVersion>6.0.*</AspNetCoreVersion>
+  </PropertyGroup>
+</Project>
diff --git a/run-docker-mongodb.ps1 b/run-docker-mongodb.ps1
index b1092b4..215b048 100644
--- a/run-docker-mongodb.ps1
+++ b/run-docker-mongodb.ps1
@@ -1,9 +1,6 @@
 #Requires -Version 7.0
 
-# This script starts a docker container with MongoDB database, used for running tests.
+# This script starts a MongoDB database in a docker container, which is required for running examples locally.
 
-docker container stop jsonapi-dotnet-core-mongodb-testing
-
-docker run --rm --name jsonapi-dotnet-core-mongodb-testing       `
- -p 27017:27017                                                  `
- mongo:latest
+docker container stop jsonapi-mongo-db
+docker run --pull always --rm --detach --name jsonapi-mongo-db -p 27017:27017 mongo:latest
diff --git a/src/Examples/GettingStarted/GettingStarted.csproj b/src/Examples/GettingStarted/GettingStarted.csproj
index a5b25ea..0f6b40f 100644
--- a/src/Examples/GettingStarted/GettingStarted.csproj
+++ b/src/Examples/GettingStarted/GettingStarted.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
+  <Import Project="..\..\..\package-versions.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\..\JsonApiDotNetCore.MongoDb\JsonApiDotNetCore.MongoDb.csproj" />
   </ItemGroup>
diff --git a/src/Examples/JsonApiDotNetCoreMongoDbExample/Definitions/TodoItemDefinition.cs b/src/Examples/JsonApiDotNetCoreMongoDbExample/Definitions/TodoItemDefinition.cs
index 61027b4..970a061 100644
--- a/src/Examples/JsonApiDotNetCoreMongoDbExample/Definitions/TodoItemDefinition.cs
+++ b/src/Examples/JsonApiDotNetCoreMongoDbExample/Definitions/TodoItemDefinition.cs
@@ -5,20 +5,30 @@
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCoreMongoDbExample.Models;
+#if NET6_0
 using Microsoft.AspNetCore.Authentication;
+#endif
 
 namespace JsonApiDotNetCoreMongoDbExample.Definitions;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public sealed class TodoItemDefinition : JsonApiResourceDefinition<TodoItem, string?>
 {
-    private readonly ISystemClock _systemClock;
+    private readonly Func<DateTimeOffset> _getUtcNow;
 
+#if NET6_0
     public TodoItemDefinition(IResourceGraph resourceGraph, ISystemClock systemClock)
         : base(resourceGraph)
     {
-        _systemClock = systemClock;
+        _getUtcNow = () => systemClock.UtcNow;
     }
+#else
+    public TodoItemDefinition(IResourceGraph resourceGraph, TimeProvider timeProvider)
+        : base(resourceGraph)
+    {
+        _getUtcNow = timeProvider.GetUtcNow;
+    }
+#endif
 
     public override SortExpression OnApplySort(SortExpression? existingSort)
     {
@@ -27,22 +37,21 @@ public override SortExpression OnApplySort(SortExpression? existingSort)
 
     private SortExpression GetDefaultSortOrder()
     {
-        return CreateSortExpressionFromLambda(new PropertySortOrder
-        {
+        return CreateSortExpressionFromLambda([
             (todoItem => todoItem.Priority, ListSortDirection.Ascending),
             (todoItem => todoItem.LastModifiedAt, ListSortDirection.Descending)
-        });
+        ]);
     }
 
     public override Task OnWritingAsync(TodoItem resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
     {
         if (writeOperation == WriteOperationKind.CreateResource)
         {
-            resource.CreatedAt = _systemClock.UtcNow;
+            resource.CreatedAt = _getUtcNow();
         }
         else if (writeOperation == WriteOperationKind.UpdateResource)
         {
-            resource.LastModifiedAt = _systemClock.UtcNow;
+            resource.LastModifiedAt = _getUtcNow();
         }
 
         return Task.CompletedTask;
diff --git a/src/Examples/JsonApiDotNetCoreMongoDbExample/JsonApiDotNetCoreMongoDbExample.csproj b/src/Examples/JsonApiDotNetCoreMongoDbExample/JsonApiDotNetCoreMongoDbExample.csproj
index a5b25ea..0f6b40f 100644
--- a/src/Examples/JsonApiDotNetCoreMongoDbExample/JsonApiDotNetCoreMongoDbExample.csproj
+++ b/src/Examples/JsonApiDotNetCoreMongoDbExample/JsonApiDotNetCoreMongoDbExample.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
+  <Import Project="..\..\..\package-versions.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\..\JsonApiDotNetCore.MongoDb\JsonApiDotNetCore.MongoDb.csproj" />
   </ItemGroup>
diff --git a/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs b/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs
index 9820cb1..e9a8026 100644
--- a/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs
+++ b/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs
@@ -4,8 +4,11 @@
 using JsonApiDotNetCore.MongoDb.Configuration;
 using JsonApiDotNetCore.MongoDb.Repositories;
 using JsonApiDotNetCore.Repositories;
-using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using MongoDB.Driver;
+#if NET6_0
+using Microsoft.AspNetCore.Authentication;
+#endif
 
 [assembly: ExcludeFromCodeCoverage]
 
@@ -13,12 +16,16 @@
 
 // Add services to the container.
 
-builder.Services.AddSingleton<ISystemClock, SystemClock>();
+#if NET6_0
+builder.Services.TryAddSingleton<ISystemClock, SystemClock>();
+#else
+builder.Services.TryAddSingleton(TimeProvider.System);
+#endif
 
 builder.Services.AddSingleton(_ =>
 {
-    var client = new MongoClient(builder.Configuration.GetSection("DatabaseSettings:ConnectionString").Value);
-    return client.GetDatabase(builder.Configuration.GetSection("DatabaseSettings:Database").Value);
+    var client = new MongoClient(builder.Configuration.GetValue<string>("DatabaseSettings:ConnectionString"));
+    return client.GetDatabase(builder.Configuration.GetValue<string>("DatabaseSettings:Database"));
 });
 
 builder.Services.AddJsonApi(ConfigureJsonApiOptions, facade => facade.AddCurrentAssembly());
diff --git a/src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj b/src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj
index 50df50f..07d7077 100644
--- a/src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj
+++ b/src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
+  <Import Project="..\..\package-versions.props" />
+
   <PropertyGroup>
     <VersionPrefix>$(JsonApiDotNetCoreMongoDbVersionPrefix)</VersionPrefix>
     <PackageTags>jsonapi;json:api;dotnet;asp.net;rest;web-api;MongoDB</PackageTags>
diff --git a/test/JsonApiDotNetCoreMongoDbTests/JsonApiDotNetCoreMongoDbTests.csproj b/test/JsonApiDotNetCoreMongoDbTests/JsonApiDotNetCoreMongoDbTests.csproj
index b8d099f..d25aea3 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/JsonApiDotNetCoreMongoDbTests.csproj
+++ b/test/JsonApiDotNetCoreMongoDbTests/JsonApiDotNetCoreMongoDbTests.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
+  <Import Project="..\..\package-versions.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
     <ProjectReference Include="..\..\src\JsonApiDotNetCore.MongoDb\JsonApiDotNetCore.MongoDb.csproj" />
diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
index 9d30f13..954ef72 100644
--- a/test/TestBuildingBlocks/TestBuildingBlocks.csproj
+++ b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
+  <Import Project="..\..\package-versions.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\JsonApiDotNetCore.MongoDb\JsonApiDotNetCore.MongoDb.csproj" />
   </ItemGroup>
diff --git a/tests.runsettings b/tests.runsettings
new file mode 100644
index 0000000..db83eb9
--- /dev/null
+++ b/tests.runsettings
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <RunConfiguration>
+    <CollectSourceInformation>true</CollectSourceInformation>
+  </RunConfiguration>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <ExcludeByAttribute>ObsoleteAttribute,GeneratedCodeAttribute</ExcludeByAttribute>
+          <DeterministicReport>true</DeterministicReport>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>

From 69ab6cea742abec1ad7b4f6ce01db052cd1d35fc Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 03:40:35 +0100
Subject: [PATCH 10/17] Only register IoC services when not already provided

---
 src/Examples/GettingStarted/Program.cs        |  3 +-
 .../Program.cs                                | 10 ++--
 .../ServiceCollectionExtensions.cs            |  5 +-
 .../AtomicOperationsFixture.cs                |  6 +-
 .../AtomicTransactionConsistencyTests.cs      |  6 +-
 .../Meta/ResourceMetaTests.cs                 |  5 +-
 .../Meta/TopLevelCountTests.cs                |  5 +-
 .../SparseFieldSets/SparseFieldSetTests.cs    |  5 +-
 ...reateResourceWithClientGeneratedIdTests.cs |  2 +-
 .../Updating/Resources/UpdateResourceTests.cs |  2 +-
 .../Reading/ResourceDefinitionReadTests.cs    |  7 ++-
 .../IntegrationTestContext.cs                 | 55 +++++++------------
 12 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/src/Examples/GettingStarted/Program.cs b/src/Examples/GettingStarted/Program.cs
index e28c933..220d664 100644
--- a/src/Examples/GettingStarted/Program.cs
+++ b/src/Examples/GettingStarted/Program.cs
@@ -2,13 +2,14 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.MongoDb.Configuration;
 using JsonApiDotNetCore.MongoDb.Repositories;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using MongoDB.Driver;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 
-builder.Services.AddSingleton(_ =>
+builder.Services.TryAddSingleton(_ =>
 {
     var client = new MongoClient(builder.Configuration.GetSection("DatabaseSettings:ConnectionString").Value);
     return client.GetDatabase(builder.Configuration.GetSection("DatabaseSettings:Database").Value);
diff --git a/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs b/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs
index e9a8026..95ec278 100644
--- a/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs
+++ b/src/Examples/JsonApiDotNetCoreMongoDbExample/Program.cs
@@ -22,19 +22,19 @@
 builder.Services.TryAddSingleton(TimeProvider.System);
 #endif
 
-builder.Services.AddSingleton(_ =>
+builder.Services.TryAddSingleton(_ =>
 {
     var client = new MongoClient(builder.Configuration.GetValue<string>("DatabaseSettings:ConnectionString"));
     return client.GetDatabase(builder.Configuration.GetValue<string>("DatabaseSettings:Database"));
 });
 
+builder.Services.TryAddScoped(typeof(IResourceReadRepository<,>), typeof(MongoRepository<,>));
+builder.Services.TryAddScoped(typeof(IResourceWriteRepository<,>), typeof(MongoRepository<,>));
+builder.Services.TryAddScoped(typeof(IResourceRepository<,>), typeof(MongoRepository<,>));
+
 builder.Services.AddJsonApi(ConfigureJsonApiOptions, facade => facade.AddCurrentAssembly());
 builder.Services.AddJsonApiMongoDb();
 
-builder.Services.AddScoped(typeof(IResourceReadRepository<,>), typeof(MongoRepository<,>));
-builder.Services.AddScoped(typeof(IResourceWriteRepository<,>), typeof(MongoRepository<,>));
-builder.Services.AddScoped(typeof(IResourceRepository<,>), typeof(MongoRepository<,>));
-
 WebApplication app = builder.Build();
 
 // Configure the HTTP request pipeline.
diff --git a/src/JsonApiDotNetCore.MongoDb/Configuration/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore.MongoDb/Configuration/ServiceCollectionExtensions.cs
index 836cf87..d39c8c7 100644
--- a/src/JsonApiDotNetCore.MongoDb/Configuration/ServiceCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore.MongoDb/Configuration/ServiceCollectionExtensions.cs
@@ -5,6 +5,7 @@
 using JsonApiDotNetCore.MongoDb.Repositories;
 using JsonApiDotNetCore.Queries;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace JsonApiDotNetCore.MongoDb.Configuration;
 
@@ -16,7 +17,9 @@ public static class ServiceCollectionExtensions
     [PublicAPI]
     public static IServiceCollection AddJsonApiMongoDb(this IServiceCollection services)
     {
-        services.AddScoped<IMongoDataAccess, MongoDataAccess>();
+        services.TryAddScoped<IMongoDataAccess, MongoDataAccess>();
+
+        // Replace the built-in implementations from JsonApiDotNetCore.
         services.AddScoped<IOperationsTransactionFactory, MongoTransactionFactory>();
         services.AddScoped<ISparseFieldSetCache, HideRelationshipsSparseFieldSetCache>();
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
index 7b0c76b..262a2b6 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Meta;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using TestBuildingBlocks;
 using Xunit;
 
@@ -18,9 +18,9 @@ public AtomicOperationsFixture()
 
         TestContext.UseController<OperationsController>();
 
-        TestContext.ConfigureServicesAfterStartup(services =>
+        TestContext.ConfigureServices(services =>
         {
-            services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.TryAddSingleton<ResourceDefinitionHitCounter>();
 
             services.AddResourceDefinition<MusicTrackMetaDefinition>();
             services.AddResourceDefinition<TextLanguageMetaDefinition>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
index a942fae..5475fcb 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
@@ -2,7 +2,7 @@
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using TestBuildingBlocks;
 using Xunit;
 
@@ -21,9 +21,9 @@ public AtomicTransactionConsistencyTests(IntegrationTestContext<TestableStartup,
 
         testContext.UseController<OperationsController>();
 
-        testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServices(services =>
         {
-            services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.TryAddSingleton<ResourceDefinitionHitCounter>();
 
             services.AddResourceRepository<PerformerRepository>();
             services.AddResourceRepository<MusicTrackRepository>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs
index 68b8478..d92419c 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/ResourceMetaTests.cs
@@ -3,6 +3,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using TestBuildingBlocks;
 using Xunit;
 
@@ -21,9 +22,9 @@ public ResourceMetaTests(IntegrationTestContext<TestableStartup, MetaDbContext>
 
         testContext.UseController<SupportTicketsController>();
 
-        testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServices(services =>
         {
-            services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.TryAddSingleton<ResourceDefinitionHitCounter>();
             services.AddResourceDefinition<SupportTicketDefinition>();
         });
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
index 03406ed..2e6a9f3 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -4,6 +4,7 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using TestBuildingBlocks;
 using Xunit;
 
@@ -22,9 +23,9 @@ public TopLevelCountTests(IntegrationTestContext<TestableStartup, MetaDbContext>
 
         testContext.UseController<SupportTicketsController>();
 
-        testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServices(services =>
         {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+            services.TryAddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
         });
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
index d6ee238..13eba01 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
@@ -3,6 +3,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using TestBuildingBlocks;
 using Xunit;
 
@@ -23,9 +24,9 @@ public SparseFieldSetTests(IntegrationTestContext<TestableStartup, QueryStringDb
         testContext.UseController<WebAccountsController>();
         testContext.UseController<BlogsController>();
 
-        testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServices(services =>
         {
-            services.AddSingleton<ResourceCaptureStore>();
+            services.TryAddSingleton<ResourceCaptureStore>();
 
             services.AddResourceRepository<ResultCapturingRepository<Blog, string?>>();
             services.AddResourceRepository<ResultCapturingRepository<BlogPost, string?>>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
index 2fc6b88..bbfbafe 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -22,7 +22,7 @@ public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableS
         testContext.UseController<WorkItemGroupsController>();
         testContext.UseController<RgbColorsController>();
 
-        testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServices(services =>
         {
             services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
         });
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
index 555e59e..672b836 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
@@ -23,7 +23,7 @@ public UpdateResourceTests(IntegrationTestContext<TestableStartup, ReadWriteDbCo
         testContext.UseController<UserAccountsController>();
         testContext.UseController<RgbColorsController>();
 
-        testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServices(services =>
         {
             services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
             services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
index 6392c4b..df3364e 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
@@ -3,6 +3,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using TestBuildingBlocks;
 using Xunit;
 
@@ -23,10 +24,10 @@ public ResourceDefinitionReadTests(IntegrationTestContext<TestableStartup, Unive
         testContext.UseController<PlanetsController>();
         testContext.UseController<MoonsController>();
 
-        testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServices(services =>
         {
-            services.AddSingleton<IClientSettingsProvider, TestClientSettingsProvider>();
-            services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.TryAddSingleton<IClientSettingsProvider, TestClientSettingsProvider>();
+            services.TryAddSingleton<ResourceDefinitionHitCounter>();
 
             services.AddResourceDefinition<MoonDefinition>();
             services.AddResourceDefinition<PlanetDefinition>();
diff --git a/test/TestBuildingBlocks/IntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs
index fd69d9d..ceeed97 100644
--- a/test/TestBuildingBlocks/IntegrationTestContext.cs
+++ b/test/TestBuildingBlocks/IntegrationTestContext.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using MongoDB.Driver;
 
@@ -36,8 +37,7 @@ public class IntegrationTestContext<TStartup, TMongoDbContextShim> : Integration
     private readonly Lazy<WebApplicationFactory<TStartup>> _lazyFactory;
     private readonly HashSet<Type> _resourceClrTypes = new();
     private readonly TestControllerProvider _testControllerProvider = new();
-
-    private Action<IServiceCollection>? _afterServicesConfiguration;
+    private Action<IServiceCollection>? _configureServices;
 
     protected override JsonSerializerOptions SerializerOptions
     {
@@ -86,16 +86,24 @@ private WebApplicationFactory<TStartup> CreateFactory()
     {
         var factory = new IntegrationTestWebApplicationFactory();
 
-        factory.ConfigureServicesBeforeStartup(services =>
+        factory.ConfigureServices(services =>
         {
+            _configureServices?.Invoke(services);
+
             services.ReplaceControllers(_testControllerProvider);
 
-            services.AddSingleton(_ =>
+            services.TryAddSingleton(_ =>
             {
                 var client = new MongoClient(_runner.Value.ConnectionString);
-                return client.GetDatabase($"JsonApiDotNetCore_MongoDb_{new Random().Next()}_Test");
+                return client.GetDatabase($"JsonApiDotNetCore_MongoDb_{Random.Shared.Next()}_Test");
             });
 
+            services.TryAddScoped<TMongoDbContextShim>();
+
+            services.TryAddScoped(typeof(IResourceReadRepository<,>), typeof(MongoRepository<,>));
+            services.TryAddScoped(typeof(IResourceWriteRepository<,>), typeof(MongoRepository<,>));
+            services.TryAddScoped(typeof(IResourceRepository<,>), typeof(MongoRepository<,>));
+
             services.AddJsonApi(ConfigureJsonApiOptions, resources: builder =>
             {
                 foreach (Type resourceClrType in _resourceClrTypes)
@@ -105,16 +113,8 @@ private WebApplicationFactory<TStartup> CreateFactory()
             });
 
             services.AddJsonApiMongoDb();
-
-            services.AddScoped(typeof(IResourceReadRepository<,>), typeof(MongoRepository<,>));
-            services.AddScoped(typeof(IResourceWriteRepository<,>), typeof(MongoRepository<,>));
-            services.AddScoped(typeof(IResourceRepository<,>), typeof(MongoRepository<,>));
-
-            services.AddScoped<TMongoDbContextShim>();
         });
 
-        factory.ConfigureServicesAfterStartup(_afterServicesConfiguration);
-
         // We have placed an appsettings.json in the TestBuildingBlock project folder and set the content root to there. Note that controllers
         // are not discovered in the content root but are registered manually using IntegrationTestContext.UseController.
         return factory.WithWebHostBuilder(builder => builder.UseSolutionRelativeContentRoot($"test/{nameof(TestBuildingBlocks)}"));
@@ -127,9 +127,9 @@ private void ConfigureJsonApiOptions(JsonApiOptions options)
         options.SerializerOptions.WriteIndented = true;
     }
 
-    public void ConfigureServicesAfterStartup(Action<IServiceCollection> servicesConfiguration)
+    public void ConfigureServices(Action<IServiceCollection> configureServices)
     {
-        _afterServicesConfiguration = servicesConfiguration;
+        _configureServices = configureServices;
     }
 
     public async Task RunOnDatabaseAsync(Func<TMongoDbContextShim, Task> asyncAction)
@@ -162,17 +162,11 @@ public override async Task DisposeAsync()
 
     private sealed class IntegrationTestWebApplicationFactory : WebApplicationFactory<TStartup>
     {
-        private Action<IServiceCollection>? _beforeServicesConfiguration;
-        private Action<IServiceCollection>? _afterServicesConfiguration;
-
-        public void ConfigureServicesBeforeStartup(Action<IServiceCollection>? servicesConfiguration)
-        {
-            _beforeServicesConfiguration = servicesConfiguration;
-        }
+        private Action<IServiceCollection>? _configureServices;
 
-        public void ConfigureServicesAfterStartup(Action<IServiceCollection>? servicesConfiguration)
+        public void ConfigureServices(Action<IServiceCollection>? configureServices)
         {
-            _afterServicesConfiguration = servicesConfiguration;
+            _configureServices = configureServices;
         }
 
         protected override IHostBuilder CreateHostBuilder()
@@ -184,21 +178,12 @@ protected override IHostBuilder CreateHostBuilder()
                 .CreateDefaultBuilder(null)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    webBuilder.ConfigureServices(services =>
-                    {
-                        _beforeServicesConfiguration?.Invoke(services);
-                    });
-
+                    webBuilder.ConfigureServices(services => _configureServices?.Invoke(services));
                     webBuilder.UseStartup<TStartup>();
-
-                    webBuilder.ConfigureServices(services =>
-                    {
-                        _afterServicesConfiguration?.Invoke(services);
-                    });
                 });
 
-            // @formatter:keep_existing_linebreaks restore
             // @formatter:wrap_before_first_method_call restore
+            // @formatter:wrap_chained_method_calls restore
         }
     }
 }

From b95817446d6b59d5fd92269a56420a1a37489d04 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 02:47:41 +0100
Subject: [PATCH 11/17] Resharper: Replace async method with Task return

---
 .../AtomicOperations/MongoTransaction.cs      | 12 ++++++----
 .../Repositories/MongoRepository.cs           |  6 ++---
 .../AtomicOperationsFixture.cs                |  4 ++--
 ...reateResourceWithClientGeneratedIdTests.cs |  4 ++--
 ...eateResourceWithToManyRelationshipTests.cs |  4 ++--
 ...reateResourceWithToOneRelationshipTests.cs |  4 ++--
 .../Deleting/AtomicDeleteResourceTests.cs     |  4 ++--
 .../Meta/AtomicResourceMetaTests.cs           |  4 ++--
 .../Transactions/AtomicRollbackTests.cs       |  8 +++----
 .../Transactions/LyricRepository.cs           |  4 ++--
 .../AtomicAddToToManyRelationshipTests.cs     |  8 +++----
 ...AtomicRemoveFromToManyRelationshipTests.cs |  8 +++----
 .../AtomicReplaceToManyRelationshipTests.cs   |  8 +++----
 .../AtomicUpdateToOneRelationshipTests.cs     |  4 ++--
 .../AtomicReplaceToManyRelationshipTests.cs   |  4 ++--
 .../Resources/AtomicUpdateResourceTests.cs    | 16 ++++++-------
 .../AtomicUpdateToOneRelationshipTests.cs     |  4 ++--
 .../Meta/TopLevelCountTests.cs                |  8 +++----
 .../SparseFieldSets/SparseFieldSetTests.cs    | 20 ++++++++--------
 ...reateResourceWithClientGeneratedIdTests.cs |  4 ++--
 ...eateResourceWithToManyRelationshipTests.cs |  4 ++--
 ...reateResourceWithToOneRelationshipTests.cs |  4 ++--
 .../ReadWrite/Deleting/DeleteResourceTests.cs |  4 ++--
 .../Fetching/FetchRelationshipTests.cs        | 12 +++++-----
 .../ReadWrite/Fetching/FetchResourceTests.cs  | 16 ++++++-------
 .../ImplicitlyChangingWorkItemDefinition.cs   |  6 +++--
 ...plicitlyChangingWorkItemGroupDefinition.cs |  6 +++--
 .../AddToToManyRelationshipTests.cs           |  8 +++----
 .../RemoveFromToManyRelationshipTests.cs      |  8 +++----
 .../ReplaceToManyRelationshipTests.cs         |  8 +++----
 .../UpdateToOneRelationshipTests.cs           |  4 ++--
 .../ReplaceToManyRelationshipTests.cs         |  8 +++----
 .../Updating/Resources/UpdateResourceTests.cs | 24 +++++++++----------
 .../Resources/UpdateToOneRelationshipTests.cs |  4 ++--
 .../Reading/ResourceDefinitionReadTests.cs    | 20 ++++++++--------
 test/TestBuildingBlocks/IntegrationTest.cs    | 24 +++++++++----------
 test/TestBuildingBlocks/MongoDbContextShim.cs |  4 ++--
 test/TestBuildingBlocks/MongoDbSetShim.cs     | 12 +++++-----
 38 files changed, 161 insertions(+), 153 deletions(-)

diff --git a/src/JsonApiDotNetCore.MongoDb/AtomicOperations/MongoTransaction.cs b/src/JsonApiDotNetCore.MongoDb/AtomicOperations/MongoTransaction.cs
index 3514e87..3ea882d 100644
--- a/src/JsonApiDotNetCore.MongoDb/AtomicOperations/MongoTransaction.cs
+++ b/src/JsonApiDotNetCore.MongoDb/AtomicOperations/MongoTransaction.cs
@@ -35,20 +35,24 @@ public Task AfterProcessOperationAsync(CancellationToken cancellationToken)
     }
 
     /// <inheritdoc />
-    public async Task CommitAsync(CancellationToken cancellationToken)
+    public Task CommitAsync(CancellationToken cancellationToken)
     {
         if (_ownsTransaction && _mongoDataAccess.ActiveSession != null)
         {
-            await _mongoDataAccess.ActiveSession.CommitTransactionAsync(cancellationToken);
+            return _mongoDataAccess.ActiveSession.CommitTransactionAsync(cancellationToken);
         }
+
+        return Task.CompletedTask;
     }
 
     /// <inheritdoc />
-    public async ValueTask DisposeAsync()
+    public ValueTask DisposeAsync()
     {
         if (_ownsTransaction)
         {
-            await _mongoDataAccess.DisposeAsync();
+            return _mongoDataAccess.DisposeAsync();
         }
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs b/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs
index f983cef..88f3d5e 100644
--- a/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs
+++ b/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs
@@ -173,11 +173,11 @@ public virtual async Task CreateAsync(TResource resourceFromRequest, TResource r
 
         await _resourceDefinitionAccessor.OnWritingAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
 
-        await SaveChangesAsync(async () =>
+        await SaveChangesAsync(() =>
         {
-            await (_mongoDataAccess.ActiveSession != null
+            return _mongoDataAccess.ActiveSession != null
                 ? Collection.InsertOneAsync(_mongoDataAccess.ActiveSession, resourceForDatabase, cancellationToken: cancellationToken)
-                : Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken));
+                : Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken);
         }, cancellationToken);
 
         await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
index 262a2b6..21db655 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs
@@ -32,8 +32,8 @@ public Task InitializeAsync()
         return Task.CompletedTask;
     }
 
-    public async Task DisposeAsync()
+    public Task DisposeAsync()
     {
-        await TestContext.DisposeAsync();
+        return TestContext.DisposeAsync();
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
index 7fdf996..27813bc 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
@@ -132,10 +132,10 @@ public async Task Cannot_create_resource_for_existing_client_generated_ID()
 
         string newIsoCode = _fakers.TextLanguage.Generate().IsoCode!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.TextLanguages.Add(existingLanguage);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs
index 94eabe3..ad022d4 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs
@@ -25,10 +25,10 @@ public async Task Cannot_create_ToMany_relationship()
 
         string newTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs
index dd7cf9e..209cdea 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs
@@ -25,10 +25,10 @@ public async Task Cannot_create_ToOne_relationship()
 
         string newLyricText = _fakers.Lyric.Generate().Text;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs
index 5721c1b..14f62fb 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs
@@ -23,10 +23,10 @@ public async Task Can_delete_existing_resource()
         // Arrange
         Performer existingPerformer = _fakers.Performer.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs
index a701256..ed87024 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs
@@ -112,10 +112,10 @@ public async Task Returns_resource_meta_in_update_resource_with_side_effects()
 
         TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.TextLanguages.Add(existingLanguage);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
index b9db4b1..294df73 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
@@ -26,9 +26,9 @@ public async Task Can_rollback_created_resource_on_error()
         string newArtistName = _fakers.Performer.Generate().ArtistName!;
         DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<Performer>();
+            return dbContext.ClearTableAsync<Performer>();
         });
 
         string unknownPerformerId = Unknown.StringId.For<Performer, string?>();
@@ -94,10 +94,10 @@ public async Task Can_rollback_updated_resource_on_error()
 
         string newArtistName = _fakers.Performer.Generate().ArtistName!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string unknownPerformerId = Unknown.StringId.For<Performer, string?>();
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
index cda8d04..d738e8d 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
@@ -26,8 +26,8 @@ public LyricRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targete
         _transaction = factory.BeginTransactionAsync(CancellationToken.None).Result;
     }
 
-    public async ValueTask DisposeAsync()
+    public ValueTask DisposeAsync()
     {
-        await _transaction.DisposeAsync();
+        return _transaction.DisposeAsync();
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs
index bf4edda..d15f9d0 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs
@@ -24,11 +24,11 @@ public async Task Cannot_add_to_OneToMany_relationship()
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
         Performer existingPerformer = _fakers.Performer.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -81,11 +81,11 @@ public async Task Cannot_add_to_ManyToMany_relationship()
         Playlist existingPlaylist = _fakers.Playlist.Generate();
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
             dbContext.Playlists.Add(existingPlaylist);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs
index cb17dcd..857f7c5 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs
@@ -24,11 +24,11 @@ public async Task Cannot_remove_from_OneToMany_relationship()
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
         existingTrack.Performers = _fakers.Performer.Generate(1);
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingTrack.Performers[0]);
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -81,11 +81,11 @@ public async Task Cannot_remove_from_ManyToMany_relationship()
         Playlist existingPlaylist = _fakers.Playlist.Generate();
         existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingPlaylist.Tracks[0]);
             dbContext.Playlists.Add(existingPlaylist);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs
index 27d679a..b716339 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs
@@ -24,11 +24,11 @@ public async Task Cannot_replace_OneToMany_relationship()
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
         Performer existingPerformer = _fakers.Performer.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -81,11 +81,11 @@ public async Task Cannot_replace_ManyToMany_relationship()
         Playlist existingPlaylist = _fakers.Playlist.Generate();
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
             dbContext.Playlists.Add(existingPlaylist);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs
index 0f80aee..dccab27 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs
@@ -24,11 +24,11 @@ public async Task Cannot_create_ManyToOne_relationship()
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
         RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.RecordCompanies.Add(existingCompany);
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs
index 162bacb..833bdd3 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs
@@ -24,11 +24,11 @@ public async Task Cannot_replace_ToMany_relationship()
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
         Performer existingPerformer = _fakers.Performer.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
index 95a65e9..7ae1426 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
@@ -89,10 +89,10 @@ public async Task Can_update_resource_without_attributes_or_relationships()
         // Arrange
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -144,10 +144,10 @@ public async Task Can_partially_update_resource_without_side_effects()
 
         string newGenre = _fakers.MusicTrack.Generate().Genre!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -202,10 +202,10 @@ public async Task Can_completely_update_resource_without_side_effects()
         string newGenre = _fakers.MusicTrack.Generate().Genre!;
         DateTimeOffset newReleasedAt = _fakers.MusicTrack.Generate().ReleasedAt;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -259,10 +259,10 @@ public async Task Can_update_resource_with_side_effects()
         TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
         string newIsoCode = _fakers.TextLanguage.Generate().IsoCode!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.TextLanguages.Add(existingLanguage);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs
index 0e0562a..df60664 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs
@@ -24,11 +24,11 @@ public async Task Cannot_create_ToOne_relationship()
         Lyric existingLyric = _fakers.Lyric.Generate();
         MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
             dbContext.Lyrics.Add(existingLyric);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
index 2e6a9f3..a1d9dde 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -62,9 +62,9 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     public async Task Renders_resource_count_for_empty_collection()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<SupportTicket>();
+            return dbContext.ClearTableAsync<SupportTicket>();
         });
 
         const string route = "/supportTickets";
@@ -117,10 +117,10 @@ public async Task Hides_resource_count_in_update_resource_response()
 
         string newDescription = _fakers.SupportTicket.Generate().Description;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.SupportTickets.Add(existingTicket);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
index 13eba01..2e6b7be 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
@@ -120,10 +120,10 @@ public async Task Can_select_attribute_in_primary_resource_by_ID()
 
         BlogPost post = _fakers.BlogPost.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Posts.Add(post);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/blogPosts/{post.StringId}?fields[blogPosts]=url";
@@ -151,10 +151,10 @@ public async Task Cannot_select_fields_of_ManyToOne_relationship()
         // Arrange
         BlogPost post = _fakers.BlogPost.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Posts.Add(post);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/blogPosts/{post.StringId}?fields[webAccounts]=displayName,emailAddress,preferences";
@@ -180,10 +180,10 @@ public async Task Cannot_select_fields_of_OneToMany_relationship()
         // Arrange
         WebAccount account = _fakers.WebAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Accounts.Add(account);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/webAccounts/{account.StringId}?fields[blogPosts]=caption,labels";
@@ -209,10 +209,10 @@ public async Task Cannot_select_fields_of_ManyToMany_relationship()
         // Arrange
         BlogPost post = _fakers.BlogPost.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Posts.Add(post);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/blogPosts/{post.StringId}?fields[labels]=color";
@@ -312,10 +312,10 @@ public async Task Fetches_all_scalar_properties_when_fieldset_contains_readonly_
         Blog blog = _fakers.Blog.Generate();
         blog.IsPublished = true;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Blogs.Add(blog);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/blogs/{blog.StringId}?fields[blogs]=showAdvertisements";
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
index bbfbafe..0152168 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -205,10 +205,10 @@ public async Task Cannot_create_resource_for_existing_client_generated_ID()
 
         string newDisplayName = _fakers.RgbColor.Generate().DisplayName;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.RgbColors.Add(existingColor);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
index e0d92de..f021d9b 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
@@ -26,10 +26,10 @@ public async Task Cannot_create_resource_with_ToMany_relationship()
         // Arrange
         UserAccount? existingUserAccount = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(existingUserAccount);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
index be6732c..f02131d 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
@@ -29,11 +29,11 @@ public async Task Cannot_create_resource_with_ToOne_relationship()
 
         string newGroupName = _fakers.WorkItemGroup.Generate().Name;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.RgbColors.Add(existingGroup.Color);
             dbContext.Groups.Add(existingGroup);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
index 3e1bb87..c00fd07 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
@@ -26,10 +26,10 @@ public async Task Can_delete_existing_resource()
         // Arrange
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/workItems/{existingWorkItem.StringId}";
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
index 6a9e32c..a7f74eb 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
@@ -26,10 +26,10 @@ public async Task Cannot_get_ManyToOne_relationship()
     {
         WorkItem workItem = _fakers.WorkItem.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(workItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/workItems/{workItem.StringId}/relationships/assignee";
@@ -55,10 +55,10 @@ public async Task Cannot_get_OneToMany_relationship()
         // Arrange
         UserAccount userAccount = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(userAccount);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/userAccounts/{userAccount.StringId}/relationships/assignedItems";
@@ -84,10 +84,10 @@ public async Task Cannot_get_ManyToMany_relationship()
         // Arrange
         WorkItem workItem = _fakers.WorkItem.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(workItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/workItems/{workItem.StringId}/relationships/tags";
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
index 39a52d6..c8ff584 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
@@ -65,10 +65,10 @@ public async Task Can_get_primary_resource_by_ID()
         // Arrange
         WorkItem workItem = _fakers.WorkItem.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(workItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/workItems/{workItem.StringId}";
@@ -116,10 +116,10 @@ public async Task Cannot_get_secondary_ManyToOne_resource()
         // Arrange
         WorkItem workItem = _fakers.WorkItem.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(workItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/workItems/{workItem.StringId}/assignee";
@@ -145,10 +145,10 @@ public async Task Cannot_get_secondary_OneToMany_resources()
         // Arrange
         UserAccount userAccount = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(userAccount);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/userAccounts/{userAccount.StringId}/assignedItems";
@@ -174,10 +174,10 @@ public async Task Cannot_get_secondary_ManyToMany_resources()
         // Arrange
         WorkItem workItem = _fakers.WorkItem.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(workItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/workItems/{workItem.StringId}/tags";
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
index 4ccfb12..61f68e1 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
@@ -22,11 +22,11 @@ public ImplicitlyChangingWorkItemDefinition(IResourceGraph resourceGraph, ReadWr
         _dbContext = dbContext;
     }
 
-    public override async Task OnWriteSucceededAsync(WorkItem resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    public override Task OnWriteSucceededAsync(WorkItem resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
     {
         if (writeOperation is not WriteOperationKind.DeleteResource)
         {
-            await _dbContext.WorkItems.ExecuteAsync(async collection =>
+            return _dbContext.WorkItems.ExecuteAsync(async collection =>
             {
                 resource.Description += Suffix;
 
@@ -34,5 +34,7 @@ await _dbContext.WorkItems.ExecuteAsync(async collection =>
                 await collection.ReplaceOneAsync(filter, resource, cancellationToken: cancellationToken);
             });
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
index a01c45e..3d4e846 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
@@ -22,11 +22,11 @@ public ImplicitlyChangingWorkItemGroupDefinition(IResourceGraph resourceGraph, R
         _dbContext = dbContext;
     }
 
-    public override async Task OnWriteSucceededAsync(WorkItemGroup resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    public override Task OnWriteSucceededAsync(WorkItemGroup resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
     {
         if (writeOperation is not WriteOperationKind.DeleteResource)
         {
-            await _dbContext.Groups.ExecuteAsync(async collection =>
+            return _dbContext.Groups.ExecuteAsync(async collection =>
             {
                 resource.Name += Suffix;
 
@@ -34,5 +34,7 @@ await _dbContext.Groups.ExecuteAsync(async collection =>
                 await collection.ReplaceOneAsync(filter, resource, cancellationToken: cancellationToken);
             });
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
index c2fd820..970c893 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
@@ -27,11 +27,11 @@ public async Task Cannot_add_to_OneToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(existingSubscriber);
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -70,11 +70,11 @@ public async Task Cannot_add_to_ManyToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         WorkTag existingTag = _fakers.WorkTag.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkTags.Add(existingTag);
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
index eab8111..22dd312 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
@@ -27,11 +27,11 @@ public async Task Cannot_remove_from_OneToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(existingWorkItem.Subscribers.ElementAt(0));
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -70,11 +70,11 @@ public async Task Cannot_remove_from_ManyToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkTags.Add(existingWorkItem.Tags.ElementAt(0));
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
index 9df3deb..0d623d7 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
@@ -27,11 +27,11 @@ public async Task Cannot_replace_OneToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(existingSubscriber);
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -70,11 +70,11 @@ public async Task Cannot_replace_ManyToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         WorkTag existingTag = _fakers.WorkTag.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkTags.Add(existingTag);
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
index ddd0f1d..38168eb 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
@@ -27,11 +27,11 @@ public async Task Cannot_replace_ToOne_relationship()
         WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
         RgbColor existingColor = _fakers.RgbColor.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.RgbColors.Add(existingColor);
             dbContext.Groups.Add(existingGroup);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
index f7fa710..fe61fa8 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
@@ -27,11 +27,11 @@ public async Task Cannot_replace_OneToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(existingSubscriber);
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -81,11 +81,11 @@ public async Task Cannot_replace_ManyToMany_relationship()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         WorkTag existingTag = _fakers.WorkTag.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkTags.Add(existingTag);
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
index 672b836..6163c5e 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
@@ -36,10 +36,10 @@ public async Task Can_update_resource_without_attributes_or_relationships()
         // Arrange
         UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(existingUserAccount);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -83,10 +83,10 @@ public async Task Can_partially_update_resource_with_string_ID()
         WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
         string newName = _fakers.WorkItemGroup.Generate().Name;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Groups.Add(existingGroup);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -135,10 +135,10 @@ public async Task Can_completely_update_resource_with_string_ID()
         RgbColor existingColor = _fakers.RgbColor.Generate();
         string newDisplayName = _fakers.RgbColor.Generate().DisplayName;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.RgbColors.Add(existingColor);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -179,10 +179,10 @@ public async Task Can_update_resource_without_side_effects()
         UserAccount existingUserAccount = _fakers.UserAccount.Generate();
         UserAccount newUserAccount = _fakers.UserAccount.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.UserAccounts.Add(existingUserAccount);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -225,10 +225,10 @@ public async Task Can_update_resource_with_side_effects()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         string newDescription = _fakers.WorkItem.Generate().Description!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
@@ -281,10 +281,10 @@ public async Task Can_update_resource_with_side_effects_with_primary_fieldset()
         WorkItem existingWorkItem = _fakers.WorkItem.Generate();
         string newDescription = _fakers.WorkItem.Generate().Description!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.WorkItems.Add(existingWorkItem);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
index c1e99fc..de4ddbc 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
@@ -27,11 +27,11 @@ public async Task Cannot_create_ToOne_relationship()
         WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
         RgbColor existingColor = _fakers.RgbColor.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.RgbColors.Add(existingColor);
             dbContext.Groups.Add(existingGroup);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
index df3364e..69bc808 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
@@ -300,10 +300,10 @@ public async Task Attribute_inclusion_from_resource_definition_is_applied_for_om
 
         Star star = _fakers.Star.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Stars.Add(star);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/stars/{star.StringId}";
@@ -340,10 +340,10 @@ public async Task Attribute_inclusion_from_resource_definition_is_applied_for_fi
 
         Star star = _fakers.Star.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Stars.Add(star);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/stars/{star.StringId}?fields[stars]=name,solarRadius";
@@ -381,10 +381,10 @@ public async Task Attribute_exclusion_from_resource_definition_is_applied_for_om
 
         Star star = _fakers.Star.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Stars.Add(star);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/stars/{star.StringId}";
@@ -421,10 +421,10 @@ public async Task Attribute_exclusion_from_resource_definition_is_applied_for_fi
 
         Star star = _fakers.Star.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Stars.Add(star);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/stars/{star.StringId}?fields[stars]=name,isVisibleFromEarth";
@@ -558,10 +558,10 @@ public async Task Queryable_parameter_handler_from_resource_definition_is_not_ap
         Planet planet = _fakers.Planet.Generate();
         planet.Moons = _fakers.Moon.Generate(1).ToHashSet();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Planets.Add(planet);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string route = $"/planets/{planet.StringId}/moons?isLargerThanTheSun=false";
diff --git a/test/TestBuildingBlocks/IntegrationTest.cs b/test/TestBuildingBlocks/IntegrationTest.cs
index 50fc3fd..2080a47 100644
--- a/test/TestBuildingBlocks/IntegrationTest.cs
+++ b/test/TestBuildingBlocks/IntegrationTest.cs
@@ -22,34 +22,34 @@ static IntegrationTest()
         ThrottleSemaphore = new SemaphoreSlim(maxConcurrentTestRuns);
     }
 
-    public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteGetAsync<TResponseDocument>(string requestUrl,
+    public Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteGetAsync<TResponseDocument>(string requestUrl,
         Action<HttpRequestHeaders>? setRequestHeaders = null)
     {
-        return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Get, requestUrl, null, null, setRequestHeaders);
+        return ExecuteRequestAsync<TResponseDocument>(HttpMethod.Get, requestUrl, null, null, setRequestHeaders);
     }
 
-    public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePostAsync<TResponseDocument>(string requestUrl,
+    public Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePostAsync<TResponseDocument>(string requestUrl,
         object requestBody, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
     {
-        return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Post, requestUrl, requestBody, contentType, setRequestHeaders);
+        return ExecuteRequestAsync<TResponseDocument>(HttpMethod.Post, requestUrl, requestBody, contentType, setRequestHeaders);
     }
 
-    public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePostAtomicAsync<TResponseDocument>(string requestUrl,
+    public Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePostAtomicAsync<TResponseDocument>(string requestUrl,
         object requestBody, string contentType = HeaderConstants.AtomicOperationsMediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
     {
-        return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Post, requestUrl, requestBody, contentType, setRequestHeaders);
+        return ExecuteRequestAsync<TResponseDocument>(HttpMethod.Post, requestUrl, requestBody, contentType, setRequestHeaders);
     }
 
-    public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePatchAsync<TResponseDocument>(string requestUrl,
+    public Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePatchAsync<TResponseDocument>(string requestUrl,
         object requestBody, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
     {
-        return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Patch, requestUrl, requestBody, contentType, setRequestHeaders);
+        return ExecuteRequestAsync<TResponseDocument>(HttpMethod.Patch, requestUrl, requestBody, contentType, setRequestHeaders);
     }
 
-    public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteDeleteAsync<TResponseDocument>(string requestUrl,
+    public Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteDeleteAsync<TResponseDocument>(string requestUrl,
         object? requestBody = null, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
     {
-        return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Delete, requestUrl, requestBody, contentType, setRequestHeaders);
+        return ExecuteRequestAsync<TResponseDocument>(HttpMethod.Delete, requestUrl, requestBody, contentType, setRequestHeaders);
     }
 
     private async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteRequestAsync<TResponseDocument>(HttpMethod method,
@@ -110,9 +110,9 @@ static IntegrationTest()
         }
     }
 
-    public async Task InitializeAsync()
+    public Task InitializeAsync()
     {
-        await ThrottleSemaphore.WaitAsync();
+        return ThrottleSemaphore.WaitAsync();
     }
 
     public virtual Task DisposeAsync()
diff --git a/test/TestBuildingBlocks/MongoDbContextShim.cs b/test/TestBuildingBlocks/MongoDbContextShim.cs
index 323af40..0800553 100644
--- a/test/TestBuildingBlocks/MongoDbContextShim.cs
+++ b/test/TestBuildingBlocks/MongoDbContextShim.cs
@@ -27,10 +27,10 @@ protected MongoDbSetShim<TEntity> Set<TEntity>()
         return dbSetShim;
     }
 
-    public async Task ClearTableAsync<TEntity>()
+    public Task ClearTableAsync<TEntity>()
         where TEntity : IMongoIdentifiable
     {
-        await _database.DropCollectionAsync(typeof(TEntity).Name);
+        return _database.DropCollectionAsync(typeof(TEntity).Name);
     }
 
     public async Task SaveChangesAsync(CancellationToken cancellation = default)
diff --git a/test/TestBuildingBlocks/MongoDbSetShim.cs b/test/TestBuildingBlocks/MongoDbSetShim.cs
index 7e58223..b78de5d 100644
--- a/test/TestBuildingBlocks/MongoDbSetShim.cs
+++ b/test/TestBuildingBlocks/MongoDbSetShim.cs
@@ -57,9 +57,9 @@ internal override async Task PersistAsync(CancellationToken cancellationToken)
         }
     }
 
-    public async Task ExecuteAsync(Func<IMongoCollection<TEntity>, Task> action)
+    public Task ExecuteAsync(Func<IMongoCollection<TEntity>, Task> action)
     {
-        await action(_collection);
+        return action(_collection);
     }
 
     public async Task<TEntity> FirstWithIdAsync(string? id, CancellationToken cancellationToken = default)
@@ -79,13 +79,13 @@ public async Task<TEntity> FirstWithIdAsync(string? id, CancellationToken cancel
         return await _collection.AsQueryable().FirstOrDefaultAsync(document => Equals(document.Id, id), cancellationToken);
     }
 
-    public async Task<List<TEntity>> ToListAsync(CancellationToken cancellationToken = default)
+    public Task<List<TEntity>> ToListAsync(CancellationToken cancellationToken = default)
     {
-        return await _collection.AsQueryable().ToListAsync(cancellationToken);
+        return _collection.AsQueryable().ToListAsync(cancellationToken);
     }
 
-    public async Task<List<TEntity>> ToListWhereAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
+    public Task<List<TEntity>> ToListWhereAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
     {
-        return await _collection.AsQueryable().Where(predicate).ToListAsync(cancellationToken);
+        return _collection.AsQueryable().Where(predicate).ToListAsync(cancellationToken);
     }
 }

From ed33dfa4f56b8d665bd9be6482a0d01409973984 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 02:55:16 +0100
Subject: [PATCH 12/17] Resharper: remove redundant body

---
 src/JsonApiDotNetCore.MongoDb/Resources/IMongoIdentifiable.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/JsonApiDotNetCore.MongoDb/Resources/IMongoIdentifiable.cs b/src/JsonApiDotNetCore.MongoDb/Resources/IMongoIdentifiable.cs
index 11dbfa2..576cdcc 100644
--- a/src/JsonApiDotNetCore.MongoDb/Resources/IMongoIdentifiable.cs
+++ b/src/JsonApiDotNetCore.MongoDb/Resources/IMongoIdentifiable.cs
@@ -5,6 +5,4 @@ namespace JsonApiDotNetCore.MongoDb.Resources;
 /// <summary>
 /// Marker interface to indicate a resource that is stored in MongoDB.
 /// </summary>
-public interface IMongoIdentifiable : IIdentifiable<string?>
-{
-}
+public interface IMongoIdentifiable : IIdentifiable<string?>;

From 38bfc4e5e054e8d400537a735af81853e05ecbda Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 03:52:05 +0100
Subject: [PATCH 13/17] Resharper: Use lambda expression

---
 src/Examples/GettingStarted/Program.cs        |  6 +----
 .../Repositories/MongoRepository.cs           | 22 ++++++++-----------
 .../Transactions/AtomicRollbackTests.cs       |  5 +----
 .../Meta/TopLevelCountTests.cs                | 10 ++-------
 ...reateResourceWithClientGeneratedIdTests.cs |  5 +----
 5 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/Examples/GettingStarted/Program.cs b/src/Examples/GettingStarted/Program.cs
index 220d664..7deafcc 100644
--- a/src/Examples/GettingStarted/Program.cs
+++ b/src/Examples/GettingStarted/Program.cs
@@ -15,11 +15,7 @@
     return client.GetDatabase(builder.Configuration.GetSection("DatabaseSettings:Database").Value);
 });
 
-builder.Services.AddJsonApi(ConfigureJsonApiOptions, resources: resourceGraphBuilder =>
-{
-    resourceGraphBuilder.Add<Book, string?>();
-});
-
+builder.Services.AddJsonApi(ConfigureJsonApiOptions, resources: resourceGraphBuilder => resourceGraphBuilder.Add<Book, string?>());
 builder.Services.AddJsonApiMongoDb();
 
 builder.Services.AddResourceRepository<MongoRepository<Book, string?>>();
diff --git a/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs b/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs
index 88f3d5e..c955f8c 100644
--- a/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs
+++ b/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs
@@ -173,12 +173,10 @@ public virtual async Task CreateAsync(TResource resourceFromRequest, TResource r
 
         await _resourceDefinitionAccessor.OnWritingAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
 
-        await SaveChangesAsync(() =>
-        {
-            return _mongoDataAccess.ActiveSession != null
+        await SaveChangesAsync(
+            () => _mongoDataAccess.ActiveSession != null
                 ? Collection.InsertOneAsync(_mongoDataAccess.ActiveSession, resourceForDatabase, cancellationToken: cancellationToken)
-                : Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken);
-        }, cancellationToken);
+                : Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken), cancellationToken);
 
         await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
     }
@@ -217,12 +215,10 @@ public virtual async Task UpdateAsync(TResource resourceFromRequest, TResource r
 
         FilterDefinition<TResource> filter = Builders<TResource>.Filter.Eq(resource => resource.Id, resourceFromDatabase.Id);
 
-        await SaveChangesAsync(async () =>
-        {
-            await (_mongoDataAccess.ActiveSession != null
+        await SaveChangesAsync(
+            () => _mongoDataAccess.ActiveSession != null
                 ? Collection.ReplaceOneAsync(_mongoDataAccess.ActiveSession, filter, resourceFromDatabase, cancellationToken: cancellationToken)
-                : Collection.ReplaceOneAsync(filter, resourceFromDatabase, cancellationToken: cancellationToken));
-        }, cancellationToken);
+                : Collection.ReplaceOneAsync(filter, resourceFromDatabase, cancellationToken: cancellationToken), cancellationToken);
 
         await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
     }
@@ -238,9 +234,9 @@ public virtual async Task DeleteAsync(TResource? resourceFromDatabase, TId id, C
         FilterDefinition<TResource> filter = Builders<TResource>.Filter.Eq(resource => resource.Id, id);
 
         DeleteResult result = await SaveChangesAsync(
-            async () => _mongoDataAccess.ActiveSession != null
-                ? await Collection.DeleteOneAsync(_mongoDataAccess.ActiveSession, filter, cancellationToken: cancellationToken)
-                : await Collection.DeleteOneAsync(filter, cancellationToken), cancellationToken);
+            () => _mongoDataAccess.ActiveSession != null
+                ? Collection.DeleteOneAsync(_mongoDataAccess.ActiveSession, filter, cancellationToken: cancellationToken)
+                : Collection.DeleteOneAsync(filter, cancellationToken), cancellationToken);
 
         if (!result.IsAcknowledged)
         {
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
index 294df73..26ea797 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
@@ -26,10 +26,7 @@ public async Task Can_rollback_created_resource_on_error()
         string newArtistName = _fakers.Performer.Generate().ArtistName!;
         DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
 
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTableAsync<Performer>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<Performer>());
 
         string unknownPerformerId = Unknown.StringId.For<Performer, string?>();
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
index a1d9dde..cd122ae 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -23,10 +23,7 @@ public TopLevelCountTests(IntegrationTestContext<TestableStartup, MetaDbContext>
 
         testContext.UseController<SupportTicketsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.TryAddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.TryAddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.IncludeTotalResourceCount = true;
@@ -62,10 +59,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     public async Task Renders_resource_count_for_empty_collection()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTableAsync<SupportTicket>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<SupportTicket>());
 
         const string route = "/supportTickets";
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
index 0152168..c763529 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -22,10 +22,7 @@ public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableS
         testContext.UseController<WorkItemGroupsController>();
         testContext.UseController<RgbColorsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>());
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.ClientIdGeneration = ClientIdGenerationMode.Required;

From 940c28cd1ca5b385dbe494e8b723e05503084c7a Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 03:55:25 +0100
Subject: [PATCH 14/17] Resharper: Use collection expression

---
 .../QueryStrings/SparseFieldSets/ResourceCaptureStore.cs     | 2 +-
 .../ResourceDefinitions/Reading/StarDefinition.cs            | 5 ++---
 test/TestBuildingBlocks/IntegrationTestContext.cs            | 2 +-
 test/TestBuildingBlocks/MongoDbContextShim.cs                | 2 +-
 test/TestBuildingBlocks/MongoDbSetShim.cs                    | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs
index 4eeea37..56e7ab9 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs
@@ -4,7 +4,7 @@ namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings.SparseFiel
 
 public sealed class ResourceCaptureStore
 {
-    internal List<IIdentifiable> Resources { get; } = new();
+    internal List<IIdentifiable> Resources { get; } = [];
 
     internal void Add(IEnumerable<IIdentifiable> resources)
     {
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs
index 5ca6551..46632bd 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs
@@ -26,11 +26,10 @@ public override SortExpression OnApplySort(SortExpression? existingSort)
 
     private SortExpression GetDefaultSortOrder()
     {
-        return CreateSortExpressionFromLambda(new PropertySortOrder
-        {
+        return CreateSortExpressionFromLambda([
             (star => star.SolarMass, ListSortDirection.Descending),
             (star => star.SolarRadius, ListSortDirection.Descending)
-        });
+        ]);
     }
 
     public override PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
diff --git a/test/TestBuildingBlocks/IntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs
index ceeed97..f479821 100644
--- a/test/TestBuildingBlocks/IntegrationTestContext.cs
+++ b/test/TestBuildingBlocks/IntegrationTestContext.cs
@@ -35,7 +35,7 @@ public class IntegrationTestContext<TStartup, TMongoDbContextShim> : Integration
 {
     private readonly Lazy<IMongoRunner> _runner;
     private readonly Lazy<WebApplicationFactory<TStartup>> _lazyFactory;
-    private readonly HashSet<Type> _resourceClrTypes = new();
+    private readonly HashSet<Type> _resourceClrTypes = [];
     private readonly TestControllerProvider _testControllerProvider = new();
     private Action<IServiceCollection>? _configureServices;
 
diff --git a/test/TestBuildingBlocks/MongoDbContextShim.cs b/test/TestBuildingBlocks/MongoDbContextShim.cs
index 0800553..0521914 100644
--- a/test/TestBuildingBlocks/MongoDbContextShim.cs
+++ b/test/TestBuildingBlocks/MongoDbContextShim.cs
@@ -10,7 +10,7 @@ namespace TestBuildingBlocks;
 public abstract class MongoDbContextShim
 {
     private readonly IMongoDatabase _database;
-    private readonly List<MongoDbSetShim> _dbSetShims = new();
+    private readonly List<MongoDbSetShim> _dbSetShims = [];
 
     protected MongoDbContextShim(IMongoDatabase database)
     {
diff --git a/test/TestBuildingBlocks/MongoDbSetShim.cs b/test/TestBuildingBlocks/MongoDbSetShim.cs
index b78de5d..16e35d5 100644
--- a/test/TestBuildingBlocks/MongoDbSetShim.cs
+++ b/test/TestBuildingBlocks/MongoDbSetShim.cs
@@ -18,7 +18,7 @@ public sealed class MongoDbSetShim<TEntity> : MongoDbSetShim
     where TEntity : IMongoIdentifiable
 {
     private readonly IMongoCollection<TEntity> _collection;
-    private readonly List<TEntity> _entitiesToInsert = new();
+    private readonly List<TEntity> _entitiesToInsert = [];
 
     internal MongoDbSetShim(IMongoCollection<TEntity> collection)
     {

From 0a6b8ef731ac25580b73c02984bbba5be9f66be8 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 04:16:10 +0100
Subject: [PATCH 15/17] Simplify test assertions

---
 .../SparseFieldSets/SparseFieldSetTests.cs             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
index 2e6b7be..b61ebac 100644
--- a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
+++ b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
@@ -85,7 +85,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
         responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
 
-        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
         postCaptured.Caption.Should().Be(post.Caption);
         postCaptured.Url.Should().BeNull();
     }
@@ -140,7 +140,7 @@ await _testContext.RunOnDatabaseAsync(dbContext =>
         responseDocument.Data.SingleValue.Attributes.ShouldContainKey("url").With(value => value.Should().Be(post.Url));
         responseDocument.Data.SingleValue.Relationships.Should().BeNull();
 
-        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
         postCaptured.Url.Should().Be(post.Url);
         postCaptured.Caption.Should().BeNull();
     }
@@ -262,7 +262,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
         responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
 
-        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
         postCaptured.Id.Should().Be(post.Id);
         postCaptured.Caption.Should().Be(post.Caption);
         postCaptured.Url.Should().BeNull();
@@ -297,7 +297,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.ManyValue[0].Attributes.Should().BeNull();
         responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
 
-        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
         postCaptured.Id.Should().Be(post.Id);
         postCaptured.Url.Should().BeNull();
     }
@@ -332,7 +332,7 @@ await _testContext.RunOnDatabaseAsync(dbContext =>
         responseDocument.Data.SingleValue.Attributes.ShouldContainKey("showAdvertisements").With(value => value.Should().Be(blog.ShowAdvertisements));
         responseDocument.Data.SingleValue.Relationships.Should().BeNull();
 
-        var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
+        var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).Which;
         blogCaptured.ShowAdvertisements.Should().Be(blog.ShowAdvertisements);
         blogCaptured.IsPublished.Should().Be(blog.IsPublished);
         blogCaptured.Title.Should().Be(blog.Title);

From b3b30260be6131f3c1982ac7f6037996a97674b5 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 04:17:51 +0100
Subject: [PATCH 16/17] Remove redundant suppression

---
 test/TestBuildingBlocks/MongoRunnerProvider.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/TestBuildingBlocks/MongoRunnerProvider.cs b/test/TestBuildingBlocks/MongoRunnerProvider.cs
index 9565815..c22b8d5 100644
--- a/test/TestBuildingBlocks/MongoRunnerProvider.cs
+++ b/test/TestBuildingBlocks/MongoRunnerProvider.cs
@@ -1,7 +1,5 @@
 using EphemeralMongo;
 
-#pragma warning disable AV1553 // Do not use optional parameters with default value null for strings, collections or tasks
-
 namespace TestBuildingBlocks;
 
 // Based on https://gist.github.com/asimmon/612b2d54f1a0d2b4e1115590d456e0be.

From 1c5579be017dd9ea32cf917fa715502ff4b9e65d Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 23 Nov 2023 04:19:42 +0100
Subject: [PATCH 17/17] Add justification for coverage exclusion

---
 test/TestBuildingBlocks/AssemblyInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/TestBuildingBlocks/AssemblyInfo.cs b/test/TestBuildingBlocks/AssemblyInfo.cs
index 82d1291..2af69d7 100644
--- a/test/TestBuildingBlocks/AssemblyInfo.cs
+++ b/test/TestBuildingBlocks/AssemblyInfo.cs
@@ -1,4 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
 
-// https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/MSBuildIntegration.md#excluding-from-coverage
+// Justification: This assembly contains building blocks for writing tests. It does not contain code that ships.
 [assembly: ExcludeFromCodeCoverage]

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb/compare/v5.4.0...v5.5.0.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb/compare/v5.4.0...v5.5.0.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb/compare/v5.4.0...v5.5.0.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb/compare/v5.4.0...v5.5.0.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>